Working

1 files changed, 26 insertions, 19 deletions

diff --git a/splashy/build/splashy.SlackBuild b/splashy/build/splashy.SlackBuild
index 05c59c88..30fcc927 100755
--- a/splashy/build/splashy.SlackBuild
+++ b/splashy/build/splashy.SlackBuild
@@ -28,7 +28,8 @@
 # For:       splashy
 # Descr:     user-space boot splash system
 # URL:       http://splashy.alioth.debian.org/
-# Needs:     directfb >= 0.9.22
+# Needs:     (only while building!) directfb >= 0.9.22, glib2, freetype
+#              and all of those with static libraries!
 # Changelog:
 # 0.3.5-1:   25/Aug/2007 by Eric Hameleers <alien@slackware.com>
 #            * Initial build.
@@ -154,6 +155,9 @@ echo Building ...
 LDFLAGS="$SLKLDFLAGS" \
 CFLAGS="$SLKCFLAGS" \
 ./configure --prefix=/ \
+            --datarootdir=/etc/splashy \
+            --datadir=/etc \
+            --mandir=/usr/man \
             --program-prefix="" \
             --program-suffix="" \
             --build=$ARCH-slackware-linux \
@@ -169,6 +173,25 @@ else
   make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
 fi
 
+# We don't need this (debian stuff):
+rm -r $PKG/etc/init.d
+rm -r $PKG/etc/console-tools
+rm $PKG/etc/lsb-base-logging.sh
+
+# Add documentation:
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
+chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/*
+
+# Move initramfs-tools stuff to the docdir:
+mv $PKG/etc/initramfs-tools $PKG/usr/doc/$PRGNAM-$VERSION/
+# Copy the debian init script to docdir:
+cp ./scripts/init.d/splashy $PKG/usr/doc/$PRGNAM-$VERSION/splashy.debian
+
+# Config file caretaking:
+mv $PKG/etc/default/splashy{,.new}
+mv $PKG/etc/splashy/config.xml{,.new}
+
 # Add this to the doinst.sh:
 ! [ -d $PKG/install ] && mkdir -p $PKG/install
 cat <<EOINS >> $PKG/install/doinst.sh
@@ -188,39 +211,23 @@ config() {
   done
 }
 
-# An example of how you handle your '.new' config files:
-#config etc/splashy.conf.new
+config etc/default/splashy.new
+config etc/splashy/config.xml.new
 
 EOINS
 
-
-# Add documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
-chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/*
-
-# Move incorrectly installed man pages, if any:
-[ -d $PKG/usr/share/man ] && \
-  mv $PKG/usr/share/man $PKG/usr/ && rmdir $PKG/usr/share || true
 # Compress the man page(s):
 if [ -d $PKG/usr/man ]; then
   find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \;
   for i in `find $PKG/usr/man -type l -name "*.?"` ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 fi
 
-# Compress info pages and remove the package's dir file:
-if [ -d $PKG/usr/info ]; then
-  rm -rf $PKG/usr/info/dir
-  gzip -9f $PKG/usr/info/*.info*
-fi
-
 # Strip binaries:
 cd $PKG
 find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 cd -
 
-
 # Add a package description:
 mkdir -p $PKG/install
 cat $SRCDIR/slack-desc > $PKG/install/slack-desc