From db75ea52df4fdae339d2fefa8a38baf0cf480c25 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Wed, 2 Jul 2008 13:37:30 +0000 Subject: Fix DESTDIR patch; add patch for recent X.Org #defines; fix manpage location --- xaudio/build/xaudio.SlackBuild | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'xaudio') diff --git a/xaudio/build/xaudio.SlackBuild b/xaudio/build/xaudio.SlackBuild index ab1f83df..645686da 100755 --- a/xaudio/build/xaudio.SlackBuild +++ b/xaudio/build/xaudio.SlackBuild @@ -142,7 +142,13 @@ elif $(file ${SOURCE} | grep -q ": gzip"); then fi cd ${PRGNAM}-${VERSION} # Add DESTDIR support to the Makefile: -cat $SRCDIR/xaudio_destdir.patch 2>&1 | tee $OUTPUT/patch-${PRGNAM}.log +cat $SRCDIR/xaudio_destdir.patch | patch -p0 \ + 2>&1 | tee $OUTPUT/patch-${PRGNAM}.log +# For newer Xorg servers, change some #defines to prevent compilation errors: +if [ -n "$(Xorg -version 2>&1 |grep 'X.Org X Server ' |rev |cut -f1 -d' ' |rev)" ]; then + cat $SRCDIR/xaudio_dix.patch | patch -p1 \ + 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log +fi chown -R root:root . chmod -R u+w,go+r-w,a-s . @@ -154,6 +160,7 @@ CFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --localstatedir=/var \ --sysconfdir=/etc \ + --mandir=/usr/man \ --program-prefix="" \ --program-suffix="" \ --build=$ARCH-slackware-linux \ @@ -169,6 +176,15 @@ else make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log fi +# Add this to the doinst.sh: +! [ -d $PKG/install ] && mkdir -p $PKG/install +cat <> $PKG/install/doinst.sh +echo "" +echo "Run the command 'sh /usr/doc/${PRGNAM}-${VERSION}/check-xorg-server.sh'" +echo "- it will tell how to add the X-Audio extension to your xorg.conf" +echo "" +EOINS + # Add documentation: mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true -- cgit v1.2.3-79-gdb01