python-ac_fixes.patch

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