From 92e8a40294901c97262d64171ac9ee15d46690e1 Mon Sep 17 00:00:00 2001 From: vincents Date: Sun, 4 Mar 2007 13:38:55 +0000 Subject: [PATCH] Fixed building mac os x installers without FCl dir git-svn-id: trunk@10704 - --- tools/install/macosx/makefpcsnapshot.sh | 5 ++++- tools/install/macosx/makefpcsrcsnapshot.sh | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/install/macosx/makefpcsnapshot.sh b/tools/install/macosx/makefpcsnapshot.sh index b249121f5c..c999679a1c 100755 --- a/tools/install/macosx/makefpcsnapshot.sh +++ b/tools/install/macosx/makefpcsnapshot.sh @@ -100,8 +100,11 @@ ln -sf ../lib/fpc/$FPCVERSION/$PPCARCH $INSTALLDIR/bin/$PPCARCH # install for use by lazarus cd fpcsrc -make compiler_install rtl_install fcl_install packages_install utils_install \ +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 diff --git a/tools/install/macosx/makefpcsrcsnapshot.sh b/tools/install/macosx/makefpcsrcsnapshot.sh index 3100f5d00f..4f283c815a 100755 --- a/tools/install/macosx/makefpcsrcsnapshot.sh +++ b/tools/install/macosx/makefpcsrcsnapshot.sh @@ -62,6 +62,9 @@ fi # copy sources mkdir -p $INSTALLDIR/fpcsrc $SVN export $FPCSOURCEDIR/rtl $INSTALLDIR/fpcsrc/rtl +if [ -d $FPCSOURCEDIR/fcl ] ; then + $SVN export $FPCSOURCEDIR/fcl $INSTALLDIR/fpcsrc/fcl +fi $SVN export $FPCSOURCEDIR/fcl $INSTALLDIR/fpcsrc/fcl $SVN export $FPCSOURCEDIR/packages $INSTALLDIR/fpcsrc/packages