From c17a7b7f200c9869f147ad052c9b5438f3dc4873 Mon Sep 17 00:00:00 2001 From: kueller Date: Wed, 2 Mar 2011 08:01:36 +0000 Subject: [PATCH] Korrektur in if schleife in postmk(). Abschliessendes fi vergessen git-svn-id: svn://svn.compuextreme.de/Viitor/V963/ViitorMake@6003 504e572c-2e33-0410-9681-be2bf7408885 --- BaseBuild/Basesys/ppl | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/BaseBuild/Basesys/ppl b/BaseBuild/Basesys/ppl index ae68e55..9ede535 100644 --- a/BaseBuild/Basesys/ppl +++ b/BaseBuild/Basesys/ppl @@ -93,15 +93,13 @@ mk32() { make -j $NUMCPU CheckError "Makeprocess failed !" 1 - MakeCheck check + MakeCheck -j $NUMCPU check # Make install Optionen eintragen - make -j $NUMCPU install + make -j $NUMCPU DESTDIR=$TMPROOT install CheckError "Make install process failed !" 1 - mv -v /usr/bin/ppl-config{,-32} - mv -v /usr/include/ppl{,-32}.hh + mv -v $TMPROOT/usr/bin/ppl-config{,-32} + mv -v $TMPROOT/usr/include/ppl{,-32}.hh make distclean - echo "Cleaned up" - read } mk() { @@ -119,18 +117,18 @@ mk() { make -j $NUMCPU CheckError "Makeprocess failed !" 1 - MakeCheck check + MakeCheck -j $NUMCPU check # Make install Optionen eintragen - make -j $NUMCPU install + make -j $NUMCPU DESTDIR=$TMPROOT install CheckError "Make install process failed !" 1 } postmk() { if [ "$MK64BIT" == "true" ]; then - mv -v /usr/bin/ppl-config{,-64} - ln -svf multiarch_wrapper /usr/bin/ppl-config - mv -v /usr/include/ppl{,-64}.hh - cat > /usr/include/ppl.hh << "EOF" + mv -v $TMPROOT/usr/bin/ppl-config{,-64} + ln -svf multiarch_wrapper $TMPROOT/usr/bin/ppl-config + mv -v $TMPROOT/usr/include/ppl{,-64}.hh + cat > $TMPROOT/usr/include/ppl.hh << "EOF" /* ppl.hh - Stub Header */ #ifndef __STUB__PPL_HH__ #define __STUB__PPL_HH__ @@ -147,4 +145,5 @@ postmk() { #endif /* __STUB__PPL_HH__ */ EOF + fi }