diff options
| author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2007-10-21 00:06:23 +0000 |
|---|---|---|
| committer | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2007-10-21 00:06:23 +0000 |
| commit | d5bf2c803d69870acbb3ace522b208245c8146c5 (patch) | |
| tree | af5c4be312af35d053054f92fd122ffebbedd592 /packages/Makefile | |
| parent | 172adb321325cb9980409470f0b50d81ac947687 (diff) | |
merged in some changes from branch-v0-39-2-extended
svn path=/trunk/; revision=8854
Diffstat (limited to 'packages/Makefile')
| -rw-r--r-- | packages/Makefile | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/packages/Makefile b/packages/Makefile index 0e84d364..5a96d003 100644 --- a/packages/Makefile +++ b/packages/Makefile @@ -48,11 +48,9 @@ FLEXT_MICRO_VERSION := $(shell grep FLEXTMICRO \ $(externals_src)/grill/flext/buildsys/version.inc | cut -d '=' -f2) FLEXT_VERSION := $(FLEXT_MAJOR_VERSION).$(FLEXT_MINOR_VERSION).$(FLEXT_MICRO_VERSION) - GEM_VERSION := $(shell grep "GEM_VERSION" $(gem_src)/src/Base/GemVersion.h | \ sed -n 's|.*GEM_VERSION = "\(.*\)".*|\1|p') - MAXLIB_VERSION := $(shell grep "define VERSION" \ $(externals_src)/maxlib/maxlib.c | cut -d '"' -f 2) @@ -478,7 +476,8 @@ $(gem_src)/src/Gem.pd_linux: $(gem_src)/src/configure # always run aclocal/autoconf until "configure" is deleted from CVS cd $(gem_src)/src && aclocal cd $(gem_src)/src && autoconf - cd $(gem_src)/src && ./configure --without-ffmpeg --with-pd=$(pd_src) --disable-NV + cd $(gem_src)/src && ./configure --without-ffmpeg --with-pd=$(pd_src) \ + --disable-NV $(MAKE) -C $(gem_src)/src $(gem_src)/src/Gem.pd_darwin: @@ -606,8 +605,8 @@ ifeq ($(OS_NAME),linux) echo "<p></p>" >> $(README_FILE) endif ifeq ($(OS_NAME),darwin) - echo "<p>To install Pd, drag the $(PACKAGE_NAME).app into your <b>/Applications</b> folder or to the shortcut in the disk image.</p>" >> $(README_FILE) - echo "<p>By default, most of the included libraries are loaded at startup. To change this, set your own preferences in the <b>Startup...</b> Preferences pane usings the <b>Save all settings</b> button. If you want to start with a blank set of preferences, run this command in the Terminal.app:</p><p><code>touch ~/Library/Preferences/org.puredata.pd.plist</code></p><p>(<code>~</code> means your home folder).</p>" >> $(README_FILE) + echo "<p>To install Pd, drag the $(PACKAGE_NAME).app into your <b>/Applications</b> folder or to the shortcut in the disk image. (<i>You might need to put the old one in the trash before copying this one to <b>/Applications</b></i>)</p>" >> $(README_FILE) + echo "<p>By default, most of the included libraries are loaded at startup. To change this, set your own preferences in the <b>Startup...</b> Preferences pane usings the <b>Save all settings</b> button. If you want to start with a blank set of preferences, run this command in the Terminal.app: </p><p><code>touch ~/Library/Preferences/org.puredata.pd.plist</code> (<code>~</code> <i>means your home folder</i>)</p><p>The Preferences panels in Pd are currently buggy, so you might have better luck with the Apple utility, Property List Editor, which is freely available as part of XCode or the Server Tools.</p>" >> $(README_FILE) endif ifeq ($(OS_NAME),windows) echo "<p>To install, run the installer.</p>" >> $(README_FILE) |