Final for 0.9.4

1 files changed, 8 insertions, 5 deletions

diff --git a/hydrogen/build/hydrogen.SlackBuild b/hydrogen/build/hydrogen.SlackBuild
index c8e7bea4..66bf3cc6 100755
--- a/hydrogen/build/hydrogen.SlackBuild
+++ b/hydrogen/build/hydrogen.SlackBuild
@@ -157,9 +157,12 @@ scons \
   jack=${USE_JACK} lrdf=${USE_LRDF} libarchive=1 \
   DESTDIR=$PKG install 2>&1 | tee $OUTPUT/install-${PRGNAM}.log
 
+# Clean up left-over makefiles:
+find $PKG/usr -name Makefile -exec rm -f {} \; || true
+
 # Move the svg files to proper place and create png files for compatibility:
 for IMG in $PKG/usr/share/pixmaps/*.svg ; do
-  convert $IMG -scale 64 $PKG/usr/share/$(basename $IMG .svg).png
+  convert $IMG -scale 64 $PKG/usr/share/pixmaps/$(basename $IMG .svg).png
 done
 mkdir -p $PKG/usr/share/icons/hicolor/scalable/apps
 mv $PKG/usr/share/pixmaps/*.svg $PKG/usr/share/icons/hicolor/scalable/apps/
@@ -193,15 +196,15 @@ find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
 # Fix and compress the man page(s) if there are any (0.9.4 has none?):
 ( cd $PKG/usr/man
-  mkdir ru/man1 ; mv ru/*.1 ru/man1/
   mv C man1
+  mkdir ru/man1 ; mv ru/*.1 ru/man1/
   find . -type f -name "*.?" -exec gzip -9f {} \;
   for i in $(find . -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 )
 
-# Strip binaries:
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+# Strip binaries (if any):
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 # Add a package description:
 mkdir -p $PKG/install