From 1402ea04b2a67c61f7454578ca035386ed2f708b Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Sat, 30 May 2009 15:55:12 +0000 Subject: Put that docdir into place ! --- testdisk/build/testdisk.SlackBuild | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'testdisk') diff --git a/testdisk/build/testdisk.SlackBuild b/testdisk/build/testdisk.SlackBuild index 9b6fb15b..08bcac5f 100755 --- a/testdisk/build/testdisk.SlackBuild +++ b/testdisk/build/testdisk.SlackBuild @@ -137,6 +137,14 @@ chown -R root:root . chmod -R u+w,go+r-w,a-s . echo Building ... + +# Build the Qt interface if Qt is found on the system. You can still +# override this by running: USEQT="" ./testdisk.SlackBuild +if which qtconfig 1>/dev/null2>&1 ; then + USEQT=${USEQT:-"--enable-qt"} +else + USEQT=${USEQT:-""} +fi LDFLAGS="$SLKLDFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \ @@ -144,11 +152,11 @@ CFLAGS="$SLKCFLAGS" \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ --localstatedir=/var \ --sysconfdir=/etc \ --program-prefix= \ --program-suffix= \ + {USEQT} \ --build=$ARCH-slackware-linux \ 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log @@ -163,8 +171,8 @@ else fi # Add documentation: -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true +mv $PKG/usr/share/doc $PKG/usr/ && rmdir $PKG/usr/share || true +cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION cat $SRCDIR/$(basename $0) | sed \ -e "/^VERSION=/s/:-.*}/:-$VERSION}/" \ -e "/^ARCH=/s/:-.*}/:-$ARCH}/" \ -- cgit v1.2.3