projects / packages / python.git / blame
| Commit | Line | Data |
|---|---|---|
| 1e4c5e1c AM |
1 | --- Python-2.5.2.orig/configure.ac 2008-02-13 19:17:17.000000000 +0000 |
| 2 | +++ Python-2.5.2/configure.ac 2008-02-26 09:43:17.000000000 +0000 | |
| bde5d589 | 3 | @@ -767,13 +767,13 @@ |
| ca37566f | 4 | if test "$Py_DEBUG" = 'true' ; then |
| 5 | # Optimization messes up debuggers, so turn it off for | |
| a7c5cbca | 6 | # debug builds. |
| 21748cff | 7 | - OPT="-g -O0 -Wall $STRICT_PROTO" |
| ca37566f | 8 | + OPT="-g $CPPFLAGS $CFLAGS -Wall $STRICT_PROTO" |
| a7c5cbca | 9 | else |
| bde5d589 | 10 | - OPT="-g $WRAP -O3 -Wall $STRICT_PROTO" |
| 11 | + OPT="-g $WRAP $CPPFLAGS $CFLAGS -Wall $STRICT_PROTO" | |
| 9d0d4238 | 12 | fi |
| 13 | ;; | |
| a7c5cbca | 14 | *) |
| ca37566f | 15 | - OPT="-O3 -Wall $STRICT_PROTO" |
| 16 | + OPT="$CPPFLAGS $CFLAGS -Wall $STRICT_PROTO" | |
| 9d0d4238 | 17 | ;; |
| a7c5cbca | 18 | esac |
| 9d0d4238 | 19 | case $ac_sys_system in |
| 21748cff AM |
20 | --- Python-2.7/Makefile.pre.in~ 2010-04-12 02:10:46.000000000 +0200 |
| 21 | +++ Python-2.7/Makefile.pre.in 2010-07-05 20:04:00.942224202 +0200 | |
| 132c1a2a AM |
22 | @@ -831,7 +831,7 @@ |
| 23 | fi; \ | |
| 24 | done | |
| 25 | $(INSTALL_DATA) $(srcdir)/Misc/python.man \ | |
| 26 | - $(DESTDIR)$(MANDIR)/man1/python$(VERSION).1 | |
| 27 | + $(DESTDIR)$(MANDIR)/man1/python.1 | |
| 28 | ||
| 1e4c5e1c AM |
29 | # Install the library |
| 30 | PLATDIR= plat-$(MACHDEP) | |
| 31 | @@ -900,9 +900,7 @@ | |
| 32 | # Install the unversioned manual pages | |
| 33 | maninstall: altmaninstall | |
| 34 | -rm -f $(DESTDIR)$(MANDIR)/man1/python2.1 | |
| 35 | - (cd $(DESTDIR)$(MANDIR)/man1; $(LN) -s python$(VERSION).1 python2.1) | |
| 36 | - -rm -f $(DESTDIR)$(MANDIR)/man1/python.1 | |
| 37 | - (cd $(DESTDIR)$(MANDIR)/man1; $(LN) -s python2.1 python.1) | |
| 38 | + (cd $(DESTDIR)$(MANDIR)/man1; $(LN) -s python.1 python2.1) | |
| 39 | ||
| 132c1a2a AM |
40 | # Install the library |
| 41 | PLATDIR= plat-$(MACHDEP) | |
| 21748cff AM |
42 | @@ -953,7 +953,7 @@ |
| 43 | python-config: $(srcdir)/Misc/python-config.in | |
| 65cc7ea0 | 44 | # Substitution happens here, as the completely-expanded BINDIR |
| 45 | # is not available in configure | |
| 46 | - sed -e "s,@EXENAME@,$(BINDIR)/python$(VERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config | |
| 47 | + sed -e "s,@EXENAME@,$(BINDIR)/python$(EXE)," < $(srcdir)/Misc/python-config.in >python-config | |
| 21748cff AM |
48 | |
| 49 | # Install the include files | |
| 50 | INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY) |