From c1595e42de840e49cfdd30c6fef6d9b3b6c8bf01 Mon Sep 17 00:00:00 2001
From: kueller <kueller@504e572c-2e33-0410-9681-be2bf7408885>
Date: Thu, 3 Mar 2011 15:56:49 +0000
Subject: [PATCH] Anpassungen an V963, Einarbeitung der neuesten CLFS Version

git-svn-id: svn://svn.compuextreme.de/Viitor/V963/ViitorMake@6021 504e572c-2e33-0410-9681-be2bf7408885
---
 BaseBuild/Basesys/Basesys.dmk           |  4 +-
 BaseBuild/Basesys/Linux-PAM             | 24 +++------
 BaseBuild/Basesys/expat                 |  7 +--
 BaseBuild/Basesys/grep                  |  6 +--
 BaseBuild/Basesys/groff                 |  7 +--
 BaseBuild/Basesys/gzip                  |  6 ++-
 BaseBuild/Basesys/iputils               |  7 +--
 BaseBuild/Basesys/kbd                   | 15 +-----
 BaseBuild/Basesys/less                  |  3 +-
 BaseBuild/Basesys/make                  |  1 +
 BaseBuild/Basesys/module-init-tools     | 15 ++++--
 BaseBuild/Basesys/net-tools             |  1 +
 BaseBuild/Basesys/patch                 |  2 +-
 BaseBuild/Basesys/{sysklogd => rsyslog} | 10 ++--
 BaseBuild/Basesys/shadow                | 70 ++++++++++++++-----------
 BaseBuild/Basesys/vim                   |  4 +-
 BaseBuild/Basesys/xz                    | 15 +++---
 17 files changed, 97 insertions(+), 100 deletions(-)
 rename BaseBuild/Basesys/{sysklogd => rsyslog} (95%)

diff --git a/BaseBuild/Basesys/Basesys.dmk b/BaseBuild/Basesys/Basesys.dmk
index 933b061..15bec32 100644
--- a/BaseBuild/Basesys/Basesys.dmk
+++ b/BaseBuild/Basesys/Basesys.dmk
@@ -92,12 +92,12 @@
 22	Basesys/pkgconfig
 22	Basesys/procps
 22	Basesys/iproute2
-16	Basesys/vim
+22	Basesys/vim
 16	Basesys/Linux-PAM
 16	Basesys/cracklib
 16	Basesys/net-tools
 16	Basesys/shadow
-16	Basesys/rsysklog
+16	Basesys/rsyslog
 16	Basesys/expat
 16	Basesys/libxml2
 16	Basesys/dbus
diff --git a/BaseBuild/Basesys/Linux-PAM b/BaseBuild/Basesys/Linux-PAM
index ba4b289..6f1ce52 100644
--- a/BaseBuild/Basesys/Linux-PAM
+++ b/BaseBuild/Basesys/Linux-PAM
@@ -71,9 +71,6 @@ SRCPATH=Base/Lib
 
 premk() {
 	mkdir -p $TMPROOT/usr/share
-	if [ ! -f /bin/pwd ]; then
-		ln -s /tools/bin/pwd /bin/pwd
-	fi
 	mkdir ../build-pam
 	cd ../build-pam
 }
@@ -84,7 +81,7 @@ mk32() {
 	                        --includedir=/usr/include/security \
 				--datadir=/usr/share \
 				--mandir=/usr/share/man
-	make
+	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 	cd ../Linux-PAM*
 	rm -r ../build-pam
@@ -93,23 +90,16 @@ mk32() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/lib64"
-	fi
-	../Linux-PAM*/configure --host=$TARGET \
-		    --prefix=/ \
-		    $ADDOPTIONS \
-		    --includedir=/usr/include/security \
-		    --datadir=/usr/share \
-		    --mandir=/usr/share/man
-	make 
+	../Linux-PAM*/configure --prefix=/ \
+				--libdir=/${LIBDIR} \
+				--includedir=/usr/include/security \
+				--datadir=/usr/share \
+				--mandir=/usr/share/man
+	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 }
 
 postmk() {
-	if [ -f /bin/pwd ]; then
-		rm /bin/pwd
-	fi
 	if [ -d $TMPROOT/share ]; then
 		mkdir -p $TMPROOT/usr
 		mv $TMPROOT/share/* $TMPROOT/usr/share
diff --git a/BaseBuild/Basesys/expat b/BaseBuild/Basesys/expat
index 6926f09..da3f4e7 100644
--- a/BaseBuild/Basesys/expat
+++ b/BaseBuild/Basesys/expat
@@ -75,7 +75,7 @@ SRCPATH=Base/Lib
 #Hier kann z.B. das Makefile gepatcht werden (SED lässt grüssen
 
 premk() {
-	mkdir $TMPROOT/usr/include -p
+	mkdir -p $TMPROOT/usr/include 
 	if [ -d /usr/man ]; then
 		mv /usr/man /usr/man.store
 	fi
@@ -98,16 +98,13 @@ mk32() {
 
 #Hier wird der Make Prozess der Sourcen definiert
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS=--libdir=/usr/lib64
-	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
 	./configure --host=$TARGET \
 		    --prefix=/usr \
                     --exec-prefix=/usr \
 		    --mandir=/usr/share/man \
-		    $ADDOPTIONS \
+		    --libdir=/usr/${LIBDIR} \
 	            --includedir=/usr/include && 
 
 	make -j $NUMCPU &&
diff --git a/BaseBuild/Basesys/grep b/BaseBuild/Basesys/grep
index ccaadd0..83f7e53 100644
--- a/BaseBuild/Basesys/grep
+++ b/BaseBuild/Basesys/grep
@@ -77,14 +77,14 @@ premk() {
 mk() {
 	CC="gcc ${BUILDOPTIONS}" \
 	./configure --prefix=/usr \
-		    --bindir=/bin &&
+		    --bindir=/bin \
+		    --without-included-regex &&
 	make -j $NUMCPU
+	MakeCheck -j $NUMCPU check
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 }
 
 postmk() {
 	mkdir -p $TMPROOT/usr/share
 	mv $TMPROOT/usr/man $TMPROOT/usr/share
-	ln -sf grep $TMPROOT/bin/egrep
-	ln -sf grep $TMPROOT/bin/fgrep
 }
diff --git a/BaseBuild/Basesys/groff b/BaseBuild/Basesys/groff
index 87c549e..a2875af 100644
--- a/BaseBuild/Basesys/groff
+++ b/BaseBuild/Basesys/groff
@@ -74,14 +74,11 @@ premk() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64"
-	fi
 	PAGE=A4 \
 	CC="gcc ${BUILDOPTIONS}" \
 	CXX="g++ ${BUILDOPTIONS}" \
-	./configure $ADDOPTIONS \
-		    --prefix=/usr
+	./configure --prefix=/usr \
+		    --libdir=/usr/${LIBDIR}
 	make -j $NUMCPU
 	make -j $NUMCPU prefix=$TMPROOT/usr install
 }
diff --git a/BaseBuild/Basesys/gzip b/BaseBuild/Basesys/gzip
index 44baefc..62be58d 100644
--- a/BaseBuild/Basesys/gzip
+++ b/BaseBuild/Basesys/gzip
@@ -71,7 +71,6 @@ SRCPATH=Base/Utilities
 
 premk() {
 	mkdir -p $TMPROOT/usr/bin $TMPROOT/bin $TMPROOT/usr/share
-	sed -i "s/futimens/gl_&/" $(grep -lr futimens *)
 }
 
 mk() {
@@ -79,6 +78,7 @@ mk() {
 	./configure --prefix=/usr \
 	            --bindir=/bin
 	make -j $NUMCPU
+	MakeCheck check
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 }
 
@@ -88,6 +88,10 @@ postmk() {
 		mv /tmp/$i $TMPROOT/bin/$i
 		chmod 755 $TMPROOT/bin/$i
 	done
+	if [ ! -d $TMPROOT/usr/bin ]; then
+		mkdir -p $TMPROOT/usr/bin
+	fi
+	mv $TMPROOT/bin/z{egrep,cmp,diff,fgrep,force,grep,less,more,new} $TMPROOT/usr/bin
 	ln -s gzip $TMPROOT/bin/compress
 	if [ -d $TMPROOT/usr/man ]; then
 		mv $TMPROOT/usr/man $TMPROOT/usr/share
diff --git a/BaseBuild/Basesys/iputils b/BaseBuild/Basesys/iputils
index f588622..593dfff 100644
--- a/BaseBuild/Basesys/iputils
+++ b/BaseBuild/Basesys/iputils
@@ -74,15 +74,16 @@ premk() {
 }
 
 mk() {
-	make -j $NUMCPU CC="gcc ${BUILDOPTIONS}"
+	make -j $NUMCPU CC="gcc ${BUILDOPTIONS}" \
+	                IPV4_TARGETS="tracepath ping clockdiff" \
+			IPV6_TARGETS="tracepath6 traceroute6" 
 }
 
 postmk() {
 	mkdir -p $TMPROOT/bin 
 	mkdir -p $TMPROOT/usr/bin 
 	mkdir -p $TMPROOT/usr/share/man/man8
-	install -v m755 ping{,6} $TMPROOT/bin
-	install -v m755 arping $TMPROOT/usr/bin
+	install -v m755 ping $TMPROOT/bin
 	install -v m755 clockdiff $TMPROOT/usr/bin
 	install -v m755 rdisc $TMPROOT/usr/bin
 	install -v m755 tracepath $TMPROOT/usr/bin
diff --git a/BaseBuild/Basesys/kbd b/BaseBuild/Basesys/kbd
index 0ab3bb4..89c2350 100644
--- a/BaseBuild/Basesys/kbd
+++ b/BaseBuild/Basesys/kbd
@@ -70,29 +70,18 @@ SRCPATH=Base/System
 
 premk() {
 	mkdir -p $TMPROOT/usr/share
-	if ! grep root /etc/passwd; then
-		cp /etc/passwd /tmp/passwd
-		echo "root::0:0:Administrator:/root:/bin/bash" >/etc/passwd
-		cat /tmp/passwd >>/etc/passwd
-		rm /tmp/passwd
-	fi
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--datadir=/lib64/kbd"
-	else
-		ADDOPTIONS="--datadir=/lib/kbd"
-	fi
 	CC="gcc ${BUILDOPTIONS}" \
-	./configure $ADDOPTIONS \
+	./configure --datadir=/${LIBDIR}/kbd \
 	            --prefix=/usr &&
 	make -j $NUMCPU CC="gcc ${BUILDOPTIONS}"
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 }
 
 postmk() {
-	mv $TMPROOT/share $TMPROOT/usr/share
+	mv $TMPROOT/share $TMPROOT/usr/
 	rm $TMPROOT/$LIBDIR/kbd/keymaps/i386/qwerty/defkeymap.map.gz
 	gzip -d -c $TMPROOT/$LIBDIR/kbd/keymaps/i386/qwertz/de-latin1.map.gz >$TMPROOT/$LIBDIR/kbd/keymaps/defkeymap.kmap
 	mkdir -p $TMPROOT/bin
diff --git a/BaseBuild/Basesys/less b/BaseBuild/Basesys/less
index 717ec34..9b08b16 100644
--- a/BaseBuild/Basesys/less
+++ b/BaseBuild/Basesys/less
@@ -81,7 +81,8 @@ mk() {
 		    --bindir=/bin \
 		    --sysconfdir=/etc &&
 	make -j $NUMCPU &&
-	make -j $NUMCPU prefix=$TMPROOT/usr bindir=$TMPROOT/bin sysconfdir=/etc install
+	#make -j $NUMCPU prefix=$TMPROOT/usr bindir=$TMPROOT/bin sysconfdir=/etc install
+	make -j $NUMCPU DESTDIR=$TMPROOT install
 }
 
 postmk() {
diff --git a/BaseBuild/Basesys/make b/BaseBuild/Basesys/make
index 89eba57..576be7d 100644
--- a/BaseBuild/Basesys/make
+++ b/BaseBuild/Basesys/make
@@ -79,6 +79,7 @@ mk() {
 	./configure --prefix=/usr \
 		    --mandir=/usr/share/man
 	make -j $NUMCPU
+	MakeCheck -j $NUMCPU check
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 }
 
diff --git a/BaseBuild/Basesys/module-init-tools b/BaseBuild/Basesys/module-init-tools
index 28a5858..e857b94 100644
--- a/BaseBuild/Basesys/module-init-tools
+++ b/BaseBuild/Basesys/module-init-tools
@@ -72,17 +72,22 @@
 SRCPATH=Base/System
 
 premk() {
-	echo "Nothing to do for premk()"
+	if [ "$CHECK" == "true" ]; then
+		sed -i "s/\(make\)\( all\)/\1 DOCBOOKTOMAN=true\2/" tests/runtests &&
+		./tests/runtests
+	else
+		echo "Nothing to do for premk()"
+	fi
 }
 
 mk() {
 	CC="gcc ${BUILDOPTIONS}" \
-	./configure --prefix=/ \
+	./configure --prefix=/usr \
 		    --bindir=/bin \
 		    --sbindir=/sbin \
-		    --enable-zlib
-	make -j $NUMCPU DOCBOOKTOMAN=""
-	make -j $NUMCPU DESTDIR=$TMPROOT INSTALL=install install
+		    --enable-zlib-dynamic
+	make -j $NUMCPU DOCBOOKTOMAN=true
+	make -j $NUMCPU DESTDIR=$TMPROOT install
 }
 
 postmk() {
diff --git a/BaseBuild/Basesys/net-tools b/BaseBuild/Basesys/net-tools
index 5518d97..7f7b990 100644
--- a/BaseBuild/Basesys/net-tools
+++ b/BaseBuild/Basesys/net-tools
@@ -88,6 +88,7 @@ mk() {
 	yes ""|make config
 	make 
 	make BASEDIR=$TMPROOT update
+	rm $TMPROOT/bin/hostname
 }
 
 postmk() {
diff --git a/BaseBuild/Basesys/patch b/BaseBuild/Basesys/patch
index 0e34581..7a75071 100644
--- a/BaseBuild/Basesys/patch
+++ b/BaseBuild/Basesys/patch
@@ -76,7 +76,7 @@ mk() {
 	CC="gcc ${BUILDOPTIONS}" \
 	./configure --prefix=/usr &&
 	make -j $NUMCPU &&
-	make -j $NUMCPU prefix=$TMPROOT/usr install
+	make -j $NUMCPU DESTDIR=$TMPROOT install
 }
 
 postmk() {
diff --git a/BaseBuild/Basesys/sysklogd b/BaseBuild/Basesys/rsyslog
similarity index 95%
rename from BaseBuild/Basesys/sysklogd
rename to BaseBuild/Basesys/rsyslog
index e6444a9..565456e 100644
--- a/BaseBuild/Basesys/sysklogd
+++ b/BaseBuild/Basesys/rsyslog
@@ -72,13 +72,15 @@ premk() {
 	mkdir -p $TMPROOT/usr/share/man/man8 \
 	         $TMPROOT/usr/share/man/man5 \
 	         $TMPROOT/usr/sbin
-#	InstallOldKernelh 1
 }
 
 mk() {
-	make -j $NUMCPU CC="gcc ${BUILDOPTIONS}" 
-	make -j $NUMCPU BINDIR=$TMPROOT/usr/sbin \
-	     MANDIR=$TMPROOT/usr/share/man install
+	CC="gcc ${BUILDOPTIONS}" \
+	./configure --prefix=/usr \
+		    --sbindir=/sbin \
+		    --libdir=/usr/${LIBDIR}
+	make -j $NUMCPU
+	make -j $NUMCPU DESTDIR=$TMPROOT install
 }
 
 postmk() {
diff --git a/BaseBuild/Basesys/shadow b/BaseBuild/Basesys/shadow
index 34d2b40..dc58fac 100644
--- a/BaseBuild/Basesys/shadow
+++ b/BaseBuild/Basesys/shadow
@@ -69,8 +69,8 @@
 SRCPATH=Base/System
 
 premk() {
-	touch /usr/bin/passwd /var/run/utmp /var/log/{btmp,lastlog,wtmp}
-	chmod 644 /var/run/utmp /var/log/{btmp,lastlog,wtmp}
+#	touch /usr/bin/passwd /var/run/utmp /var/log/{btmp,lastlog,wtmp}
+#	chmod 644 /var/run/utmp /var/log/{btmp,lastlog,wtmp}
 	mkdir ../build-shadow
 	cd ../build-shadow
 }
@@ -78,14 +78,13 @@ premk() {
 mk32() {
 	CC="gcc ${BUILDOPTIONS32}" \
 	CXX="g++ ${BUILDOPTIONS32}" \
-	../shadow*/configure --prefix=/usr \
-	            --libdir=/lib \
-		    --sysconfdir=/etc \
-		    --enable-shared \
-		    --with-libpam \
-		    --without-audit \
-		    --without-selinux \
-		    --with-libcrack 
+	../shadow*/configure --sysconfdir=/etc \
+			     --with-libpam \
+			     --without-audit \
+			     --without-selinux \
+			     --prefix=/usr \
+			     --enable-shared \
+			     --with-libcrack 
 	sed -i 's/groups$(EXEEXT) //' src/Makefile
 	find man -name Makefile -exec sed -i '/groups.1.xml/d' '{}' \;
 	find man -name Makefile -exec sed -i 's/groups.1 //' '{}' \;
@@ -100,23 +99,22 @@ mk32() {
 	rm -r ../build-shadow
 	mkdir ../build-shadow
 	cd ../build-shadow
-	GenDynLib32 $TMPROOT/lib/libshadow.a 4.1.2.2
-	GenDynLib32 $TMPROOT/lib/libmisc.a 4.1.2.2
+	GenDynLib32 $TMPROOT/lib/libshadow.a 4.1.4.2
+	GenDynLib32 $TMPROOT/lib/libmisc.a 4.1.4.2
 }
 
 		    
 mk() {
 	CC="gcc ${BUILDOPTIONS} -fPIC" \
 	CC="gcc ${BUILDOPTIONS} -fPIC"  \
-	../shadow*/configure --host=$TARGET \
-	            --prefix=/usr \
-		    --libdir=/$LIBDIR \
-		    --sysconfdir=/etc \
-		    --enable-shared \
-		    --with-libpam \
-		    --without-audit \
-		    --without-selinux \
-		    --with-libcrack 
+	../shadow*/configure --sysconfdir=/etc \
+			     --with-libpam \
+			     --without-audit \
+			     --without-selinux \
+			     --libdir=/$LIBDIR \
+			     --sysconfdir=/etc \
+			     --enable-shared \
+			     --with-libcrack 
 	sed -i 's/groups$(EXEEXT) //' src/Makefile
 	find man -name Makefile -exec sed -i '/groups.1.xml/d' '{}' \;
 	find man -name Makefile -exec sed -i 's/groups.1 //' '{}' \;
@@ -131,21 +129,33 @@ mk() {
 	fi
 	cp lib/.libs/libshadow.a $TMPROOT/$LIBDIR
 	cp libmisc/libmisc.a $TMPROOT/$LIBDIR
-	GenDynLib $TMPROOT/$LIBDIR/libshadow.a 4.1.2.2
-	GenDynLib $TMPROOT/$LIBDIR/libmisc.a 4.1.2.2
+	GenDynLib $TMPROOT/$LIBDIR/libshadow.a 4.1.4.2
+	GenDynLib $TMPROOT/$LIBDIR/libmisc.a 4.1.4.2
 }
 
 postmk() {
 	mkdir -p $TMPROOT/{etc,bin,var,usr} $TMPROOT/usr/lib $TMPROOT/var/{log,run}
 	cd ../shadow*
 	cp etc/{limits,login.access} $TMPROOT/etc
-	sed -i -e "s%/var/spool/mail%/var/mail%" \
-	    -e "s%#MD5_CRYPT_ENAB.no%MD5_CRYPT_ENAB yes%" $TMPROOT/etc/login.defs
-        FUNCTIONS="LASTLOG_ENAB MAIL_CHECK_ENAB PORTTIME_CHECKS_ENAB CONSOLE MOTD_FILE
-           NOLOGINS_FILE PASS_MIN_LEN SU_WHEEL_ONLY MD5_CRYPT_ENAB CONSOLE_GROUPS
-           ENVIRON_FILE ULIMIT ENV_TZ ENV_HZ ENV_SUPATH ENV_PATH QMAIL_DIR MAIL_DIR
-           MAIL_FILE CHFN_AUTH FAILLOG_ENAB QUOTAS_ENAB FTMP_FILE OBSCURE_CHECKS_ENAB
-           CRACKLIB_DICTPATH PASS_CHANGE_TRIES PASS_ALWAYS"
+	sed -i -e 's%/var/spool/mail%/var/mail%' \
+	    -e 's@#\(ENCRYPT_METHOD \).*@\1MD5@' $TMPROOT/etc/login.defs
+        FUNCTIONS="FAILLOG_ENAB \
+	           LASTLOG_ENAB \
+		   MAIL_CHECK_ENAB \
+		   OBSCURE_CHECKS_ENAB \
+		   PORTTIME_CHECKS_ENAB \
+		   QUOTAS_ENAB \
+		   MOTD_FILE \
+		   FTMP_FILE \
+		   NOLOGINS_FILE \
+		   ENV_HZ \
+		   PASS_MIN_LEN \
+		   SU_WHEEL_ONLY \
+		   CRACKLIB_DICTPATH \
+		   PASS_CHANGE_TRIES \
+		   PASS_ALWAYS_WARN \
+		   CHFN_AUTH \
+		   ENVIRON_FILE "
 	for function in $FUNCTIONS; do
      		sed -i -e "s/^$function/# &/" $TMPROOT/etc/login.defs
 	done
diff --git a/BaseBuild/Basesys/vim b/BaseBuild/Basesys/vim
index 06f980f..4e0012c 100644
--- a/BaseBuild/Basesys/vim
+++ b/BaseBuild/Basesys/vim
@@ -77,7 +77,6 @@ SRCPATH=Base/Utilities
 premk() {
 	mkdir -p $TMPROOT/usr/share
 	echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h
-	echo '#define SYS_GVIMRC_FILE "/etc/gvimrc"' >> src/feature.h
 }
 
 mk() {
@@ -86,7 +85,8 @@ mk() {
 	./configure --prefix=/usr \
 		    --enable-multibyte
 	make -j $NUMCPU &&
-	make -j $NUMCPU prefix=$TMPROOT/usr localstatedir=$TMPROOT/var/lib/vim install
+	MakeCheck test
+	make -j $NUMCPU DESTDIR=$TMPROOT install
 }
 
 postmk() {
diff --git a/BaseBuild/Basesys/xz b/BaseBuild/Basesys/xz
index e9344a0..22f735b 100644
--- a/BaseBuild/Basesys/xz
+++ b/BaseBuild/Basesys/xz
@@ -91,6 +91,10 @@ mk32() {
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 	mv $TMPROOT/usr/bin/{xz,lzma,lzcat,unlzma,unxz,xzcat} $TMPROOT/bin
+	if [ ! -d $TMPROOT/usr/lib ]; then
+		mkdir $TMPROOT/usr/lib
+	fi
+	mv $TMPROOT/lib/liblzma.a $TMPROOT/usr/lib
 	cd ../xz*
 	rm -r ../build-xz
 	mkdir ../build-xz
@@ -98,18 +102,13 @@ mk32() {
 }
 
 mk() {
-	if [ $MK64BIT == "true" ]; then
-		ADDOPTIONS="--libdir=/lib64"
-	else
-		ADDOPTIONS="--libdir=/lib"
-	fi
 	CC="gcc ${BUILDOPTIONS}" \
-	CXX="g++ ${BUILDOPTIONS}" \
-	../xz*/configure $ADDOPTIONS \
-		    --prefix=/usr 
+	../xz*/configure --libdir=/${LIBDIR} \
+			 --prefix=/usr 
 	make -j $NUMCPU 
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 	mv $TMPROOT/usr/bin/{xz,lzma,lzcat,unlzma,unxz,xzcat} $TMPROOT/bin
+	mv $TMPROOT/${LIBDIR}/liblzma.a $TMPROOT/usr/${LIBDIR}
 }
 
 postmk() {