From 2e6e2e7c645907ca4420f85c47d3587228945dd4 Mon Sep 17 00:00:00 2001 From: vincents Date: Fri, 6 Jun 2008 09:05:26 +0000 Subject: [PATCH] mac os x installer build script: clean up and reordering of statements git-svn-id: trunk@15337 - --- tools/install/macosx/makefpcsnapshot.sh | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/tools/install/macosx/makefpcsnapshot.sh b/tools/install/macosx/makefpcsnapshot.sh index 0d72107c78..24974c47e8 100755 --- a/tools/install/macosx/makefpcsnapshot.sh +++ b/tools/install/macosx/makefpcsnapshot.sh @@ -101,6 +101,12 @@ fi mkdir -p $INSTALLDIR make install PP=$COMPILER INSTALL_PREFIX=$INSTALLDIR +# install for use by lazarus +make -C fpcsrc compiler_install rtl_install packages_install utils_install \ + INSTALL_PREFIX=$INSTALLFPCDIR PP=$COMPILER FPCMAKE=$FPCBUILDDIR/fpcsrc/utils/fpcm/fpcmake + +make -C fpcsrc\compiler installsymlink PP=$COMPILER INSTALL_PREFIX=$INSTALLFPCDIR + if [ $CREATECROSSPPC == 1 ]; then make all PP=$PPC_RELEASE CPU_TARGET=powerpc cp fpcsrc/compiler/ppcrossppc fpcsrc/compiler/ppcppc @@ -119,16 +125,6 @@ fi # on the user's machine after installation ln -sf ../lib/fpc/$FPCVERSION/$PPCARCH $INSTALLDIR/bin/$PPCARCH -# install for use by lazarus -cd fpcsrc -make compiler_install rtl_install packages_install utils_install \ - INSTALL_PREFIX=$INSTALLFPCDIR PP=$COMPILER FPCMAKE=$FPCBUILDDIR/fpcsrc/utils/fpcm/fpcmake -if [ -d $FPCBUILDDIR/fpcsrc/fcl ]; then - make fcl_install INSTALL_PREFIX=$INSTALLFPCDIR PP=$COMPILER FPCMAKE=$FPCBUILDDIR/fpcsrc/utils/fpcm/fpcmake -fi -make -C compiler installsymlink PP=$COMPILER INSTALL_PREFIX=$INSTALLFPCDIR - - # fill in packproj template. OLDIFS=$IFS IFS=.