diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2006-06-07 19:06:01 (GMT) |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2006-06-07 19:06:01 (GMT) |
| commit | 2db3a8f73ea74dd9403ce558e360f4583419a998 (patch) | |
| tree | c4b77be7fe3c09750f806bb704e77401f22a66e0 /Makefile.pre.in | |
| parent | 32f5d8f1b153be33be42df82eb0f04c42006db54 (diff) | |
| download | cpython-2db3a8f73ea74dd9403ce558e360f4583419a998.zip cpython-2db3a8f73ea74dd9403ce558e360f4583419a998.tar.gz cpython-2db3a8f73ea74dd9403ce558e360f4583419a998.tar.bz2 | |
And the last bit: move IDLE one level up and adjust makefiles
Diffstat (limited to 'Makefile.pre.in')
| -rw-r--r-- | Makefile.pre.in | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 3f37259..e63066ce 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -374,7 +374,7 @@ libpython$(VERSION).sl: $(LIBRARY_OBJS) # This rule is here for OPENSTEP/Rhapsody/MacOSX. It builds a temporary # minimal framework (not including the Lib directory and such) in the current # directory. -RESSRCDIR=$(srcdir)/Mac/OSXResources/framework +RESSRCDIR=$(srcdir)/Mac/Resources/framework $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \ $(LIBRARY) \ $(RESSRCDIR)/Info.plist \ @@ -897,7 +897,7 @@ sharedinstall: # Here are a couple of targets for MacOSX again, to install a full # framework-based Python. frameworkinstall installs everything, the # subtargets install specific parts. Much of the actual work is offloaded to -# the Makefile in Mac/OSX +# the Makefile in Mac # # # This target is here for backward compatiblity, previous versions of Python @@ -938,25 +938,23 @@ frameworkinstallstructure: $(LDLIBRARY) # This installs Mac/Lib into the framework frameworkinstallmaclib: - cd Mac/OSX && $(MAKE) installmacsubtree DESTDIR="$(DESTDIR)" + cd Mac && $(MAKE) installmacsubtree DESTDIR="$(DESTDIR)" # This installs the IDE, the Launcher and other apps into /Applications frameworkinstallapps: - cd Mac/OSX && $(MAKE) installapps DESTDIR="$(DESTDIR)" + cd Mac && $(MAKE) installapps DESTDIR="$(DESTDIR)" # This install the unix python and pythonw tools in /usr/local/bin frameworkinstallunixtools: - cd Mac/OSX && $(MAKE) installunixtools DESTDIR="$(DESTDIR)" + cd Mac && $(MAKE) installunixtools DESTDIR="$(DESTDIR)" frameworkaltinstallunixtools: - cd Mac/OSX && $(MAKE) altinstallunixtools DESTDIR="$(DESTDIR)" + cd Mac && $(MAKE) altinstallunixtools DESTDIR="$(DESTDIR)" # This installs the Demos and Tools into the applications directory. # It is not part of a normal frameworkinstall frameworkinstallextras: - $(MAKE) -f Mac/OSX/Makefile installextras \ - $(RUNSHARED) BUILDPYTHON=./$(BUILDPYTHON) DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \ - srcdir=$(srcdir) builddir=. DESTDIR=$(DESTDIR) + cd Mac && Make installextras DESTDIR="$(DESTDIR)" # This installs a few of the useful scripts in Tools/scripts scriptsinstall: |