From 90a701587775dfa9b783ddab89cb2b4f105537d4 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Sun, 31 Aug 2003 21:41:49 +0000 Subject: fixed 'make darwin_pkg_clean' bug svn path=/trunk/externals/miXed/; revision=919 --- Makefile.common | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'Makefile.common') diff --git a/Makefile.common b/Makefile.common index e7110a9..a7b391b 100644 --- a/Makefile.common +++ b/Makefile.common @@ -324,7 +324,8 @@ Makefile.deps: # added by Hans-Christoph Steiner # to generate MacOS X packages -PACKAGE_NAME = pd-$(BASE_NAME)-$(VERSION)-$(RELEASE)$(BUILD) +PACKAGE_PREFIX = pd-$(BASE_NAME) +PACKAGE_NAME = $(PACKAGE_PREFIX)-$(VERSION)-$(RELEASE)$(BUILD) darwin_pkg_license: # generate HTML version of License @@ -333,8 +334,8 @@ darwin_pkg_license: echo "" >> License.html darwin_pkg_clean: - -sudo rm -Rf installroot/ $(PACKAGE_NAME)*.pkg/ - -rm -f $(PACKAGE_NAME)*.info *~ 1 License.html + -sudo rm -Rf installroot/ $(PACKAGE_PREFIX)*.pkg/ + -rm -f $(PACKAGE_PREFIX)-*.info *~ 1 License.html # install into MacOS X style paths: /Library/Pd @@ -360,7 +361,7 @@ darwin_altpkg: all darwin_pkg_clean darwin_pkg_license # install into MSP's default: /usr/local/lib darwin_pkg: all darwin_pkg_clean darwin_pkg_license - # set up installroot dir +# set up installroot dir test -d installroot/lib/pd/doc/5.reference || mkdir -p installroot/lib/pd/doc/5.reference cp ../test/cyclone/*.pd ../test/cyclone/test* ../test/cyclone/*.coll ../test/cyclone/*.mid installroot/lib/pd/doc/5.reference test -d installroot/lib/pd/extra || mkdir -p installroot/lib/pd/extra @@ -372,12 +373,12 @@ darwin_pkg: all darwin_pkg_clean darwin_pkg_license rm -f installroot/lib/pd/extra/hammer.pd_darwin rm -f installroot/lib/pd/extra/sickle.pd_darwin rm -f installroot/lib/pd/extra/cyclone.pd_darwin - # delete cruft +# delete cruft -find installroot -name .DS_Store -delete -rm -f 1 - # set proper permissions +# set proper permissions sudo chown -R root:staff installroot package installroot $(PACKAGE_NAME).info -d . -ignoreDSStore - # install pkg docs +# install pkg docs install -m 644 License.html Welcome.html $(PACKAGE_NAME).pkg/Contents/Resources sudo chown -R root:staff $(PACKAGE_NAME).pkg/Contents/Resources -- cgit v1.2.1