diff options
| author |   Eric Hameleers <alien@slackware.com> | 2007-09-10 21:13:22 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2007-09-10 21:13:22 +0000 |
| commit | 3f59dceffd6603dedc470e129cf91d62ef54600e (patch) | |
| tree | 1f8681c58eb1e54f9f195637869e7bd90100fa6c /psi | |
| parent | 462625a49e58d948077147ef658b8f0d92bfdb27 (diff) | |
| download | asb-3f59dceffd6603dedc470e129cf91d62ef54600e.tar.gz asb-3f59dceffd6603dedc470e129cf91d62ef54600e.tar.xz | |
Fixes which should make it build and install correctly
Diffstat (limited to 'psi')
| -rwxr-xr-x | psi/build/psi.SlackBuild | 20 |
1 files changed, 10 insertions, 10 deletions
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 |