diff --git a/tools/install/macosx/create_lazarus_dmg.sh b/tools/install/macosx/create_lazarus_dmg.sh index fb3d23313f..68949c6667 100755 --- a/tools/install/macosx/create_lazarus_dmg.sh +++ b/tools/install/macosx/create_lazarus_dmg.sh @@ -140,8 +140,8 @@ find $BUILDDIR -name '.svn' -exec rm -rf {} \; || true find $BUILDDIR -name '.DS_Store' -exec rm -rf {} \; || true # create symlinks -mkdir -p $ROOTDIR/usr/bin -cd $ROOTDIR/usr/bin +mkdir -p $ROOTDIR/usr/local/bin +cd $ROOTDIR/usr/local/bin ln -s /Developer/lazarus/lazbuild lazbuild cp $TEMPLATEDIR/uninstall.sh $ROOTDIR/Developer/lazarus/ diff --git a/tools/install/macosx/lazarus.packproj.template b/tools/install/macosx/lazarus.packproj.template index be0e275100..8f645bbcb5 100644 --- a/tools/install/macosx/lazarus.packproj.template +++ b/tools/install/macosx/lazarus.packproj.template @@ -444,24 +444,7 @@ Children - - - Children - - GID - 0 - Path - Root/usr/bin/lazbuild - Path Type - 2 - Privileges - 493 - Type - 3 - UID - 0 - - + GID 0 Path @@ -525,7 +508,24 @@ Children - + + + Children + + GID + 0 + Path + Root/usr/local/bin + Path Type + 2 + Privileges + 509 + Type + 3 + UID + 0 + + GID 0 Path diff --git a/tools/install/macosx/uninstall.sh b/tools/install/macosx/uninstall.sh index 8d378888a8..27327bcfac 100644 --- a/tools/install/macosx/uninstall.sh +++ b/tools/install/macosx/uninstall.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -sudo rm -rf /Developer/lazarus /Applications/Lazarus.app /etc/lazarus /usr/bin/lazbuild +sudo rm -rf /Developer/lazarus /Applications/Lazarus.app /etc/lazarus /usr/local/bin/lazbuild # end.