Add a .desktop file plus icon; fix the 'make install' process

1 files changed, 19 insertions, 7 deletions

diff --git a/xmahjongg/build/xmahjongg.SlackBuild b/xmahjongg/build/xmahjongg.SlackBuild
index 545ffcd7..b0a9878a 100755
--- a/xmahjongg/build/xmahjongg.SlackBuild
+++ b/xmahjongg/build/xmahjongg.SlackBuild
@@ -171,19 +171,31 @@ make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
 # Install all the needed stuff to the package dir
 # Use installwatch if available, to produce a logfile of the installation
 # process that is more easily readable:
-mkdir -p ${PKG}${XPREF}/bin $PKG/usr/man/man6
-install -c -s xmahjongg ${PKG}${XPREF}/bin/xmahjongg
-install -c -m 644 xmahjongg.6 $PKG/usr/man/man6/xmahjongg.6
-make pkgdatadir="${PKG}${XPREF}/lib/X11/xmahjongg" install-share
-
 if $(which installwatch > /dev/null 2>&1); then
   installwatch -o $OUTPUT/install-${PRGNAM}.log \
-    make pkgdatadir="${PKG}${XPREF}/lib/X11/xmahjongg" install-share
+    make DESTDIR=$PKG install-share install-man
 else
-  make pkgdatadir="${PKG}${XPREF}/lib/X11/xmahjongg" install-share \
+  make DESTDIR=$PKG install-share install-man \
     2>&1 |tee $OUTPUT/install-${PRGNAM}.log
 fi
 
+# Add a .desktop file and icon: 
+mkdir -p $PKG/usr/share/pixmaps
+cp  $SRCDIR/xmahjongg.png $PKG/usr/share/pixmaps
+mkdir -p $PKG/usr/share/applications
+cat <<-EOT > $PKG/usr/share/applications/xmahjongg.desktop
+	[Desktop Entry]
+	Name=Xmahjongg
+	GenericName=
+	Comment=Colorful solitaire Mah Jongg game
+	Icon=/usr/share/pixmaps/xmahjongg.png
+	Exec=xmahjongg
+	Terminal=false
+	Type=Application
+	Encoding=UTF-8
+	Categories=Game;BoardGame;
+	EOT
+
 # Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true