diff options
| author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2003-08-31 21:38:07 +0000 |
|---|---|---|
| committer | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2003-08-31 21:38:07 +0000 |
| commit | f028e69660ef4bff979a782e1f261ea6d0300f67 (patch) | |
| tree | a0354935fca6a71d81081c48e37a9c4b3f6db743 | |
| parent | eb4a1670b8d2ac2c823c0c17254e3c38e834f0e2 (diff) | |
fixed 'make clean' bug
svn path=/trunk/; revision=918
| -rw-r--r-- | doc/Makefile | 7 | ||||
| -rw-r--r-- | doc/pddp/Makefile | 118 | ||||
| -rw-r--r-- | packages/darwin_pkg/Makefile | 7 |
3 files changed, 67 insertions, 65 deletions
diff --git a/doc/Makefile b/doc/Makefile index c2efc2b8..4fa15da5 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -4,7 +4,8 @@ current: darwin_pkg
PDDOC_VERSION = $(shell date +20%y.%m.%d)
-PACKAGE_NAME = pd-doc-$(PDDOC_VERSION)
+PACKAGE_PREFIX = pd-doc
+PACKAGE_NAME = $(PACKAGE_PREFIX)-$(PDDOC_VERSION)
darwin_pkg_license:
# generate HTML version of License
@@ -16,8 +17,8 @@ darwin_pkg_welcome: # generate Welcome.html from ../README.txt
darwin_pkg_clean:
- -sudo rm -Rf installroot/ pd-doc*.pkg/
- -rm -f pd-doc-*.info 1 License.html Welcome.???*
+ -sudo rm -Rf installroot/ $(PACKAGE_PREFIX)*.pkg/
+ -rm -f $(PACKAGE_PREFIX)-*.info 1 License.html Welcome.???*
# install into MSP's default: /usr/local/lib
diff --git a/doc/pddp/Makefile b/doc/pddp/Makefile index fddc7dac..3b7af70d 100644 --- a/doc/pddp/Makefile +++ b/doc/pddp/Makefile @@ -1,59 +1,59 @@ -# created by Hans-Christoph Steiner <hans@eds.org> to generate MacOS X packages
-# Hopefully, others will be coming soon.
-
-current: darwin_package
-
-PDDP_VERSION = $(shell date +20%y.%m.%d)
-
-PACKAGE_NAME = pd-pddp-$(PDDP_VERSION)
-
-clean:
- -rm -Rf installroot *~
-
-darwin_pkg_license:
- # generate HTML version of License
-# echo "<HTML><BODY><FONT SIZE="-1">" > License.html
-# cat ../../creb/COPYING | sed -e 's/^$$/\<P\>/g' >> License.html
-# echo "</FONT></BODY></HTML>" >> License.html
-
-darwin_pkg_welcome:
-# generate Welcome.html from ../README.txt
-
-darwin_pkg_clean:
- -sudo rm -Rf installroot/ $(PACKAGE_NAME)*.pkg/
- -rm -f $(PACKAGE_NAME)*.info 1 License.html Welcome.???*
-
-# install into MSP's default: /usr/local/lib
-
-darwin_pkg: darwin_pkg_clean darwin_pkg_license darwin_pkg_welcome
-# set up installroot dir
- test -d installroot/pd/doc/5.reference/ || mkdir -p installroot/pd/doc/5.reference/
- install -m644 --group=staff *.pd installroot/pd/doc/5.reference/
- cp -f pd-pddp.info $(PACKAGE_NAME).info
-# delete cruft
- -find installroot -name .DS_Store -delete
- -rm -f 1
-# set proper permissions
- sudo chown -R root:staff installroot
- package installroot $(PACKAGE_NAME).info -d . -ignoreDSStore
-# install pkg docs
-# install -m 644 License.html Welcome.txt $(PACKAGE_NAME).pkg/Contents/Resources
- sudo chown -R root:staff $(PACKAGE_NAME).pkg/Contents/Resources
-
-# install into MacOS X style path: /Library/Pd
-
-darwin_altpkg: darwin_pkg_clean darwin_pkg_license darwin_pkg_welcome
- test -d installroot/Help || mkdir -p installroot/Help
- install -m644 --group=staff *.pd installroot/Help
- sed -e 's/\/usr\/local\/lib/\/Library\/Pd/' pd-pddp.info \
- | sed -e 's/MSP standard paths/MacOS X-style Paths/' \
- > $(PACKAGE_NAME)-alt.info
- # delete cruft
- -find installroot -name .DS_Store -delete
- -rm -f 1
- # set proper permissions
- sudo chown -R root:staff installroot
- package installroot $(PACKAGE_NAME)-alt.info -d . -ignoreDSStore
- # install pkg docs
-# install -m 644 License.html Welcome.txt $(PACKAGE_NAME)-alt.pkg/Contents/Resources
- sudo chown -R root:staff $(PACKAGE_NAME)-alt.pkg/Contents/Resources
+# created by Hans-Christoph Steiner <hans@eds.org> to generate MacOS X packages +# Hopefully, others will be coming soon. + +current: darwin_package + +PDDP_VERSION = $(shell date +20%y.%m.%d) +PACKAGE_PREFIX = pd-pddp +PACKAGE_NAME = $(PACKAGE_PREFIX)-$(PDDP_VERSION) + +clean: + -rm -Rf installroot *~ + +darwin_pkg_license: + # generate HTML version of License + echo "<HTML><BODY><FONT SIZE="-1">" > License.html + cat LICENSE.txt | sed -e 's/^$$/\<P\>/g' >> License.html + echo "</FONT></BODY></HTML>" >> License.html + +darwin_pkg_welcome: +# generate Welcome.html from ../README.txt + +darwin_pkg_clean: + -sudo rm -Rf installroot/ $(PACKAGE_PREFIX)*.pkg/ + -rm -f $(PACKAGE_PREFIX)-*.info 1 License.html Welcome.???* + +# install into MSP's default: /usr/local/lib + +darwin_pkg: darwin_pkg_clean darwin_pkg_license darwin_pkg_welcome +# set up installroot dir + test -d installroot/pd/doc/5.reference/ || mkdir -p installroot/pd/doc/5.reference/ + install -m644 --group=staff *.pd installroot/pd/doc/5.reference/ + cp -f pd-pddp.info $(PACKAGE_NAME).info +# delete cruft + -find installroot -name .DS_Store -delete + -rm -f 1 +# set proper permissions + sudo chown -R root:staff installroot + package installroot $(PACKAGE_NAME).info -d . -ignoreDSStore +# install pkg docs + install -m 644 License.html $(PACKAGE_NAME).pkg/Contents/Resources + sudo chown -R root:staff $(PACKAGE_NAME).pkg/Contents/Resources + +# install into MacOS X style path: /Library/Pd + +darwin_altpkg: darwin_pkg_clean darwin_pkg_license darwin_pkg_welcome + test -d installroot/Help || mkdir -p installroot/Help + install -m644 --group=staff *.pd installroot/Help + sed -e 's/\/usr\/local\/lib/\/Library\/Pd/' pd-pddp.info \ + | sed -e 's/MSP standard paths/MacOS X-style Paths/' \ + > $(PACKAGE_NAME)-alt.info + # delete cruft + -find installroot -name .DS_Store -delete + -rm -f 1 + # set proper permissions + sudo chown -R root:staff installroot + package installroot $(PACKAGE_NAME)-alt.info -d . -ignoreDSStore + # install pkg docs + install -m 644 License.html $(PACKAGE_NAME)-alt.pkg/Contents/Resources + sudo chown -R root:staff $(PACKAGE_NAME)-alt.pkg/Contents/Resources diff --git a/packages/darwin_pkg/Makefile b/packages/darwin_pkg/Makefile index c95ef62b..936a7d24 100644 --- a/packages/darwin_pkg/Makefile +++ b/packages/darwin_pkg/Makefile @@ -25,12 +25,13 @@ DMG_PREFIX = Pure Data Installer DMG_NAME = $(DMG_PREFIX) $(PD_VERSION)-$(PACKAGE_VERSION) WELCOME_FILE = Welcome.html -INFO_FILE = $(PACKAGE_PREFIX) $(PD_VERSION)-$(PACKAGE_VERSION).info +INFO_FILE = $(PACKAGE_PREFIX).info clean: darwin_mpkg_clean darwin_mpkg_clean: - -sudo rm -Rf installroot "$(DMG_PREFIX)*" + -sudo rm -Rf installroot + -sudo rm -Rf "$(DMG_PREFIX)"* -rm -f "$(WELCOME_FILE)" *.dmg *~ cd ../externals/build/darwin ; make darwin_pkg_clean cd ../externals/zexy/src ; make -f makefile.darwin darwin_pkg_clean @@ -42,7 +43,7 @@ darwin_mpkg_welcome: echo $(CYCLONE_RELEASE) -rm $(WELCOME_FILE) echo "<HTML><BODY>" > $(WELCOME_FILE) - echo "<H2>Pure Data Installer$(PD_VERSION)-$(PACKAGE_VERSION)</H2>" >> $(WELCOME_FILE) + echo "<H2>Pure Data Installer $(PD_VERSION)-$(PACKAGE_VERSION)</H2>" >> $(WELCOME_FILE) echo "<P>Pd is a free real-time computer music software package resembling Max. It provides a patchable environment for audio analysis, synthesis, and processing, with a rich set of multimedia capabilities. You can get Pd for Linux, Windows, MacOS X, BSD, or IRIX.</P>" >> $(WELCOME_FILE) echo "<P>It is written by Miller S. Puckette with many other contributors.</P>" >> $(WELCOME_FILE) echo "<P>For more information, go to: http://www.pure-data.org</P>" >> $(WELCOME_FILE) |