← Back to branch summary

~ubuntu-branches/ubuntu/natty/python3.1/natty-security

« back to all changes in this revision

Viewing changes to Mac/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2010-03-21 17:27:57 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20100321172757-v29qykjsa8u718lo
Tags: 3.1.2-0ubuntu1
https://launchpad.net/bugs/462950
* Python 3.1.2 release.
* Fix issue #4961: Inconsistent/wrong result of askyesno function in
  tkMessageBox with Tcl8.5. LP: #462950.
* Don't complain when /usr/local is not writable on installation.
* Apply proposed patch for issue #8032, gdb7 hooks for debugging.
* Backport issue #8140: Extend compileall to compile single files.
  Add -i option.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Mac/Makefile.in
144
144
                -DPYTHONWEXECUTABLE='"$(APPINSTALLDIR)/Contents/MacOS/$(PYTHONFRAMEWORK)"'
145
145
 
146
146
pythonw-32: $(srcdir)/Tools/pythonw.c Makefile
147
 
        $(CC) $(LDFLAGS) -o $@ -arch i386 -arch ppc $(srcdir)/Tools/pythonw.c \
148
 
                -DPYTHONWEXECUTABLE='"$(APPINSTALLDIR)/Contents/MacOS/$(PYTHONFRAMEWORK)-32"'
 
147
        $(CC) $(LDFLAGS) -o pythonw-tmp.o $(srcdir)/Tools/pythonw.c \
 
148
                -DPYTHONWEXECUTABLE='"$(APPINSTALLDIR)/Contents/MacOS/$(PYTHONFRAMEWORK)-32"' ;\
 
149
        lipo  @LIPO_32BIT_FLAGS@ -output $@  pythonw-tmp.o ; rm pythonw-tmp.o
149
150
 
150
151
pythonw-64: $(srcdir)/Tools/pythonw.c Makefile
151
 
        $(CC) $(LDFLAGS) -o $@ -arch x86_64 -arch ppc64 $(srcdir)/Tools/pythonw.c \
152
 
                -DPYTHONWEXECUTABLE='"$(APPINSTALLDIR)/Contents/MacOS/$(PYTHONFRAMEWORK)-64"'
 
152
        $(CC) $(LDFLAGS) -o pythonw-tmp.o $(srcdir)/Tools/pythonw.c \
 
153
                -DPYTHONWEXECUTABLE='"$(APPINSTALLDIR)/Contents/MacOS/$(PYTHONFRAMEWORK)-64"' ;\
 
154
        lipo  @LIPO_64BIT_FLAGS@ -output $@  pythonw-tmp.o ; rm pythonw-tmp.o
153
155
 
154
156
install_PythonLauncher:
155
157
        cd PythonLauncher && make install DESTDIR=$(DESTDIR)
206
208
        rm "$(DESTDIR)$(APPINSTALLDIR)/Contents/Info.plist.in"
207
209
 
208
210
install_Python4way: install_Python
209
 
        lipo  -extract i386 -extract ppc7400 -output "$(DESTDIR)$(APPINSTALLDIR)/Contents/MacOS/$(PYTHONFRAMEWORK)-32" "$(DESTDIR)$(APPINSTALLDIR)/Contents/MacOS/$(PYTHONFRAMEWORK)"
210
 
        lipo  -extract x86_64 -extract ppc64 -output "$(DESTDIR)$(APPINSTALLDIR)/Contents/MacOS/$(PYTHONFRAMEWORK)-64" "$(DESTDIR)$(APPINSTALLDIR)/Contents/MacOS/$(PYTHONFRAMEWORK)"
 
211
        lipo  @LIPO_32BIT_FLAGS@ -output "$(DESTDIR)$(APPINSTALLDIR)/Contents/MacOS/$(PYTHONFRAMEWORK)-32" "$(DESTDIR)$(APPINSTALLDIR)/Contents/MacOS/$(PYTHONFRAMEWORK)"
 
212
        lipo  @LIPO_64BIT_FLAGS@ -output "$(DESTDIR)$(APPINSTALLDIR)/Contents/MacOS/$(PYTHONFRAMEWORK)-64" "$(DESTDIR)$(APPINSTALLDIR)/Contents/MacOS/$(PYTHONFRAMEWORK)"
211
213
 
212
214
 
213
215