Working script

1 files changed, 36 insertions, 0 deletions

diff --git a/libgda/build/libgda.SlackBuild b/libgda/build/libgda.SlackBuild
index dd3777a1..c03bf4e6 100755
--- a/libgda/build/libgda.SlackBuild
+++ b/libgda/build/libgda.SlackBuild
@@ -156,11 +156,16 @@ CFLAGS="$SLKCFLAGS" \
             --libdir=/usr/lib${LIBDIRSUFFIX} \
             --localstatedir=/var \
             --sysconfdir=/etc \
+            --disable-static \
             --mandir=/usr/man \
+            --docdir=/usr/doc/${PRGNAM}-${VERSION} \
+            --enable-binreloc \
             --program-prefix="" \
             --program-suffix="" \
             --build=$ARCH-slackware-linux \
             2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
+# Fix installation of some binaries outside $PKG :
+(cd libgda-report && patch -p0 < $SRCDIR/RML_Makefiles.patch)
 make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
 
 #
@@ -174,6 +179,37 @@ else
   make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
 fi
 
+# These went astray:
+#mv /usr/bin/gda_trml2html  $PKG/usr/bin/
+#mv /usr/bin/gda_trml2pdf $PKG/usr/bin/
+
+# Handle the configuration file:
+SHORTVS=$( basename $PKG/etc/libgda-* | cut -f2 -d- )
+mv $PKG/etc/${PRGNAM}-${SHORTVS}/config{,.new}
+
+# Add this to the doinst.sh:
+! [ -d $PKG/install ] && mkdir -p $PKG/install
+cat <<EOINS >> $PKG/install/doinst.sh
+# Handle the incoming configuration files:
+config() {
+  for infile in \$1; do
+    NEW="\$infile"
+    OLD="\`dirname \$NEW\`/\`basename \$NEW .new\`"
+    # If there's no config file by that name, mv it over:
+    if [ ! -r \$OLD ]; then
+      mv \$NEW \$OLD
+    elif [ "\`cat \$OLD | md5sum\`" = "\`cat \$NEW | md5sum\`" ]; then
+      # toss the redundant copy
+      rm \$NEW
+    fi
+    # Otherwise, we leave the .new copy for the admin to consider...
+  done
+}
+
+config etc/${PRGNAM}-${SHORTVS}/config.new
+
+EOINS
+
 # Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true