From 6915c58bee2882fcea41a63d563430c0d05c3cbb Mon Sep 17 00:00:00 2001
From: kueller <kueller@504e572c-2e33-0410-9681-be2bf7408885>
Date: Sun, 22 Aug 2010 17:01:33 +0000
Subject: [PATCH] =?UTF-8?q?Debug=20f=C3=BCr=20pciutils=20aktiviert.=20libp?=
 =?UTF-8?q?ci=20wird=20jetzt=20generiert=20(dynamisch)=20und=20inclusive?=
 =?UTF-8?q?=20Haeder=20files=20installiert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@5796 504e572c-2e33-0410-9681-be2bf7408885
---
 SysBuild/BuildCluster/BaseSysTools.dmk |  4 ++--
 SysBuild/tools/pciutils                | 33 ++++++++++++++++++++++++--
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/SysBuild/BuildCluster/BaseSysTools.dmk b/SysBuild/BuildCluster/BaseSysTools.dmk
index 4ee732e..31768ff 100755
--- a/SysBuild/BuildCluster/BaseSysTools.dmk
+++ b/SysBuild/BuildCluster/BaseSysTools.dmk
@@ -132,9 +132,9 @@
 0       tools/a2ps
 0       tools/binfmt_misc
 0       network/wget
-0       tools/pciutils
+32       tools/pciutils
 0	tools/usbutils
-0       tools/psutils
+64       tools/psutils
 0       tools/hdparm
 0	development/cmake
 0	network/libmsn
diff --git a/SysBuild/tools/pciutils b/SysBuild/tools/pciutils
index 5152dd6..c0e8e63 100644
--- a/SysBuild/tools/pciutils
+++ b/SysBuild/tools/pciutils
@@ -81,20 +81,49 @@ premk() {
 	CheckError "premk() failed !" 1
 }
 
+mk32() {
+	# Make-Optionen eintragen
+	make CC="gcc $BUILDOPTIONS32" \
+	     CXX="g++ $BUILDOPTIONS32" \
+	     SHARED=yes \
+	     LIBDIR="\$(PREFIX)/lib"
+	CheckError "Makeprocess failed  !" 1
+	
+	# Make install Optionen eintragen
+	make ROOT=$TMPROOT \
+	     PREFIX=$TMPROOT/usr \
+	     SHARED=yes \
+	     LIBDIR="\$(PREFIX)/lib" \
+	     install
+	CheckError "Make install process failed !" 1
+	make distclean
+	echo "ready"
+	read
+}
+
 mk() {
 	# Make-Optionen eintragen
-	make CC="gcc $BUILDOPTIONS" CXX="g++ $BUILDOPTIONS"
+	make CC="gcc $BUILDOPTIONS" \
+	     CXX="g++ $BUILDOPTIONS" \
+	     SHARED=yes \
+	     LIBDIR="\$(PREFIX)/$LIBDIR"
 	CheckError "Makeprocess failed  !" 1
 	./update-pciids.sh
 	
 	# Make install Optionen eintragen
-	make ROOT=$TMPROOT PREFIX=$TMPROOT/usr install
+	make ROOT=$TMPROOT \
+	     PREFIX=$TMPROOT/usr \
+	     SHARED=yes \
+	     LIBDIR="\$(PREFIX)/$LIBDIR" \
+	     install
 	CheckError "Make install process failed !" 1
 }
 
 postmk() {
 	mkdir -p $TMPROOT/usr/share
 	mkdir -p $TMPROOT/usr/local/share
+	mkdir -p $TMPROOT/usr/include/pci
+	cp lib/*.h $TMPROOT/usr/include/pci/
 	cd $TMPROOT/usr/local/share
 	ln -s ../../share/pci.ids.gz .
 	mv $TMPROOT/usr/man $TMPROOT/usr/share