From 3f59dceffd6603dedc470e129cf91d62ef54600e Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Mon, 10 Sep 2007 21:13:22 +0000
Subject: Fixes which should make it build and install correctly

---
 psi/build/psi.SlackBuild | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'psi/build')

diff --git a/psi/build/psi.SlackBuild b/psi/build/psi.SlackBuild
index 5d082c87..aa070aab 100755
--- a/psi/build/psi.SlackBuild
+++ b/psi/build/psi.SlackBuild
@@ -129,8 +129,10 @@ esac
 # Create working directories:
 mkdir -p $TMP/tmp-$PRGNAM # location to build the source
 rm -rf $TMP/tmp-$PRGNAM/* # By default we remove the remnants of previous build
-mkdir -p $PKG     # place for the package to be built
-rm -rf $PKG/*     # We always erase old package's contents:
+mkdir -p $PKG        # place for the package to be built
+mkdir -p ${PKG}-lang # place for the package to be built
+rm -rf $PKG/*        # We always erase old package's contents:
+rm -rf ${PKG}-lang/* # We always erase old package's contents:
 mkdir -p $OUTPUT  # place for the package to be saved
 
 # Source file availability:
@@ -185,10 +187,10 @@ echo "++"
 
 cd $TMP/tmp-$PRGNAM
 echo "Extracting the source archive(s) for $PRGNAM..."
-if `file ${SOURCE[$i]} | grep -q ": bzip2"`; then
-  tar -xjvf ${SOURCE[$i]}
-elif `file ${SOURCE[$i]} | grep -q ": gzip"`; then
-  tar -xzvf ${SOURCE[$i]}
+if `file ${SOURCE} | grep -q ": bzip2"`; then
+  tar -xjvf ${SOURCE}
+elif `file ${SOURCE} | grep -q ": gzip"`; then
+  tar -xzvf ${SOURCE}
 fi
 cd ${PRGNAM}-${VERSION}
 chown -R root:root .
@@ -198,8 +200,6 @@ echo Building ...
 LDFLAGS="$SLKLDFLAGS" \
 CFLAGS="$SLKCFLAGS" \
 ./configure --prefix=/usr \
-            --libdir=/usr/lib${LIBDIRSUFFIX} \
-            --build=$ARCH-slackware-linux \
             2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
 make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
 
@@ -207,9 +207,9 @@ make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
 # Use installwatch if available, to produce a logfile of the installation
 # process that is more easily readable:
 if `which installwatch > /dev/null 2>&1`; then
-  installwatch -o $OUTPUT/install-${PRGNAM}.log make DESTDIR=$PKG install
+  installwatch -o $OUTPUT/install-${PRGNAM}.log make INSTALL_ROOT=$PKG install
 else
-  make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
+  make INSTALL_ROOT=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
 fi
 
 # Not only KDE wants a pixmap
-- 
cgit v1.2.3-65-gdbad