From fcc3d035c3291fe257dd6407cfa3e857d69556aa Mon Sep 17 00:00:00 2001 From: Jonathan Wilkes <jon.w.wilkes@gmail.com> Date: Thu, 10 Nov 2016 21:47:07 -0500 Subject: [PATCH] clean up the OSX Makefile according to Christian Frisson's suggestions and revisions: don't build wiringPi don't run dpkg-architecture remove reference to AppMain.tcl --- l2ork_addons/tar_em_up.sh | 4 ++-- packages/darwin_app/Makefile | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/l2ork_addons/tar_em_up.sh b/l2ork_addons/tar_em_up.sh index 3048826d5..d4d6e6ce4 100755 --- a/l2ork_addons/tar_em_up.sh +++ b/l2ork_addons/tar_em_up.sh @@ -283,7 +283,7 @@ then cd ../../ fi # install raspberry pi externals (if applicable) - if [ $inno -eq 0 -o $dmg -eq 0 ]; then + if [ $inno -eq 0 -a $dmg -eq 0 ]; then cd raspberry_pi ./makeall.sh cp -f disis_gpio/disis_gpio.pd_linux ../../packages/linux_make/build$inst_dir/lib/pd-l2ork/extra @@ -296,7 +296,7 @@ then echo "done with l2ork addons." cd ../ # finish install for deb - if [ $inno -eq 0 -o $dmg -eq 0 ]; then + if [ $inno -eq 0 -a $dmg -eq 0 ]; then cd packages/linux_make rm -f build/usr/local/lib/pd if [ $pkg -gt 0 ]; then diff --git a/packages/darwin_app/Makefile b/packages/darwin_app/Makefile index b69e08d8d..f37cf5495 100644 --- a/packages/darwin_app/Makefile +++ b/packages/darwin_app/Makefile @@ -191,10 +191,6 @@ darwin_app_core: darwin_app_wrapper install -d "$(PD_APP_CONTENTS)/Resources/bin" cd "$(PD_APP_CONTENTS)/Resources" && \ ln -s bin Scripts - cd "$(PD_APP_CONTENTS)/Resources/bin" && \ - test -e AppMain.tcl || ln -s pd.tk AppMain.tcl - cd "$(PD_APP_CONTENTS)/Resources/bin" && \ - test -e pdextended || ln -s pd pdextended # support for Info Panel Plugins mgmt cd "$(PD_APP_CONTENTS)" && ln -s Resources/extra Plugins install -p -m0644 org.puredata.pd-l2ork.default.plist "$(PD_APP_CONTENTS)/Resources/" -- GitLab