diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 2003-07-04 12:14:39 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 2003-07-04 12:14:39 (GMT) |
| commit | 66b84832477258a009dbc011f1ac20a42495d220 (patch) | |
| tree | 803df4492698c700ec74ce850f39b6738ae444f4 /Makefile.pre.in | |
| parent | 276b2900b813745801cf08c73169cf0fcd0fa75a (diff) | |
| download | cpython-66b84832477258a009dbc011f1ac20a42495d220.zip cpython-66b84832477258a009dbc011f1ac20a42495d220.tar.gz cpython-66b84832477258a009dbc011f1ac20a42495d220.tar.bz2 | |
Fixed two bugs in MacOSX framework handling spotted by Edward Moy:
- In the top level Makefile, the argument to -install_name should be
prepended with /System/Library/Frameworks/, so it is an absolute path.
- In the top level Makefile, because of 2), RUNSHARED needs to be set to
DYLD_FRAMEWORK_PATH=<path to local framework> and $(RUNSHARED) prepended
to the $(MAKE) lines in the frameworkinstallmaclib and
frameworkinstallapps targets.
Diffstat (limited to 'Makefile.pre.in')
| -rw-r--r-- | Makefile.pre.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 27e8090..d7de18e 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -858,14 +858,14 @@ frameworkinstallstructure: $(LDLIBRARY) # This installs Mac/Lib into the framework frameworkinstallmaclib: $(MAKE) -f $(srcdir)/Mac/OSX/Makefile installmacsubtree \ - BUILDPYTHON=./$(BUILDPYTHON) DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \ + $(RUNSHARED) BUILDPYTHON=./$(BUILDPYTHON) DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \ srcdir=$(srcdir) builddir=. prefix=$(prefix) LIBDEST=$(LIBDEST) \ DESTDIR=$(DESTDIR) # This installs the IDE, the Launcher and other apps into /Applications frameworkinstallapps: $(MAKE) -f $(srcdir)/Mac/OSX/Makefile installapps \ - BUILDPYTHON=./$(BUILDPYTHON) DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \ + $(RUNSHARED) BUILDPYTHON=./$(BUILDPYTHON) DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \ srcdir=$(srcdir) builddir=. DESTDIR=$(DESTDIR) # This install the unix python and pythonw tools in /usr/local/bin @@ -878,7 +878,7 @@ frameworkinstallunixtools: # It is not part of a normal frameworkinstall frameworkinstallextras: $(MAKE) -f $(srcdir)/Mac/OSX/Makefile installextras \ - BUILDPYTHON=./$(BUILDPYTHON) DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \ + $(RUNSHARED) BUILDPYTHON=./$(BUILDPYTHON) DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \ srcdir=$(srcdir) builddir=. DESTDIR=$(DESTDIR) # This installs a few of the useful scripts in Tools/scripts |