From e2d38568b52b954f70c5e124b33191684e40967d Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Wed, 27 May 2009 17:58:16 +0000
Subject: Take care of lib64

---
 p7zip/build/p7zip.SlackBuild | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

(limited to 'p7zip')

diff --git a/p7zip/build/p7zip.SlackBuild b/p7zip/build/p7zip.SlackBuild
index ed5ccab5..034560bc 100755
--- a/p7zip/build/p7zip.SlackBuild
+++ b/p7zip/build/p7zip.SlackBuild
@@ -148,16 +148,25 @@ chmod -R u+w,go+r-w,a-s .
 
 echo Building ...
 cp -f makefile.linux_${ARCHSUFFIX} makefile.machine
-make OPTFLAGS="$SLKCFLAGS" DEST_HOME=/usr DEST_SHARE_DOC=/usr/doc/${PRGNAM}-${VERSION} all3 \
-  2>&1 | tee $OUTPUT/make-${PRGNAM}.log
+make OPTFLAGS="$SLKCFLAGS" \
+     DEST_HOME=/usr \
+     DEST_SHARE=/usr/lib${LIBDIRSUFFIX}/p7zip \
+     DEST_SHARE_DOC=/usr/doc/${PRGNAM}-${VERSION} \
+     all3 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
 
-# Install all the needed stuff to the package dir
-# 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 DEST_HOME=/usr DEST_SHARE_DOC=/usr/doc/${PRGNAM}-${VERSION} DEST_DIR=$PKG install
+  installwatch -o $OUTPUT/install-${PRGNAM}.log make install \
+    DEST_HOME=/usr \
+    DEST_SHARE=/usr/lib${LIBDIRSUFFIX}/p7zip \
+    DEST_SHARE_DOC=/usr/doc/${PRGNAM}-${VERSION} \
+    DEST_DIR=$PKG
 else
-  make DEST_HOME=/usr DEST_SHARE_DOC=/usr/doc/${PRGNAM}-${VERSION} DEST_DIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
+  make install \
+    DEST_HOME=/usr \
+    DEST_SHARE=/usr/lib${LIBDIRSUFFIX}/p7zip \
+    DEST_SHARE_DOC=/usr/doc/${PRGNAM}-${VERSION} \
+    DEST_DIR=$PKG \
+    2>&1 |tee $OUTPUT/install-${PRGNAM}.log
 fi
 
 # Add documentation:
-- 
cgit v1.2.3-65-gdbad