python-DESTDIR.patch

   1 --- Python-2.3a2.orig/Makefile.pre.in   Tue Jan 21 16:05:02 2003
   2 +++ Python-2.3a2/Makefile.pre.in        Wed Apr  9 15:36:39 2003
   3 @@ -546,7 +546,7 @@
   4                 @for i in X $(SHAREDMODS); do \
   5                   if test $$i != X; then \
   6                     echo $(INSTALL_SHARED) $$i $(DESTSHARED)/`basename $$i`; \
   7 -                   $(INSTALL_SHARED) $$i $(DESTSHARED)/`basename $$i`; \
   8 +                   $(INSTALL_SHARED) $$i $(DESTDIR)$(DESTSHARED)/`basename $$i`; \
   9                   fi; \
  10                 done
  11
  12 @@ -555,7 +555,7 @@
  13                 do \
  14                         if test ! -d $$i; then \
  15                                 echo "Creating directory $$i"; \
  16 -                               $(INSTALL) -d -m $(DIRMODE) $$i; \
  17 +                               $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \
  18                         else    true; \
  19                         fi; \
  20                 done
  21 @@ -563,11 +563,11 @@
  22
  23  # Install the interpreter (by creating a hard link to python$(VERSION))
  24  bininstall:    altbininstall
  25 -       -if test -f $(BINDIR)/$(PYTHON) -o -L $(BINDIR)/$(PYTHON); \
  26 -       then rm -f $(BINDIR)/$(PYTHON); \
  27 +       -if test -f $(DESTDIR)$(BINDIR)/$(PYTHON) -o -L $(DESTDIR)$(BINDIR)/$(PYTHON); \
  28 +       then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \
  29         else true; \
  30         fi
  31 -       (cd $(BINDIR); $(LN) python$(VERSION)$(EXE) $(PYTHON))
  32 +       (cd $(DESTDIR)$(BINDIR); $(LN) python$(VERSION)$(EXE) $(PYTHON))
  33
  34  # Install the interpreter with $(VERSION) affixed
  35  # This goes into $(exec_prefix)
  36 @@ -582,16 +582,16 @@
  37         do \
  38                 if test ! -d $$i; then \
  39                         echo "Creating directory $$i"; \
  40 -                       $(INSTALL) -d -m $(DIRMODE) $$i; \
  41 +                       $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \
  42                 else    true; \
  43                 fi; \
  44         done
  45 -       $(INSTALL_PROGRAM) $(BUILDPYTHON) $(BINDIR)/python$(VERSION)$(EXE)
  46 +       $(INSTALL_PROGRAM) $(BUILDPYTHON) $(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE)
  47         if test -f libpython$(VERSION)$(SO); then \
  48                 if test "$(SO)" = .dll; then \
  49 -                       $(INSTALL_SHARED) libpython$(VERSION)$(SO) $(BINDIR); \
  50 +                       $(INSTALL_SHARED) libpython$(VERSION)$(SO) $(DESTDIR)$(BINDIR); \
  51                 else \
  52 -                       $(INSTALL_SHARED) libpython$(VERSION)$(SO) $(LIBDIR)/$(INSTSONAME); \
  53 +                       $(INSTALL_SHARED) libpython$(VERSION)$(SO) $(DESTDIR)$(LIBDIR)/$(INSTSONAME); \
  54                 fi; \
  55         else    true; \
  56         fi
  57 @@ -602,12 +602,12 @@
  58         do \
  59                 if test ! -d $$i; then \
  60                         echo "Creating directory $$i"; \
  61 -                       $(INSTALL) -d -m $(DIRMODE) $$i; \
  62 +                       $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \
  63                 else    true; \
  64                 fi; \
  65         done
  66         $(INSTALL_DATA) $(srcdir)/Misc/python.man \
  67 -               $(MANDIR)/man1/python.1
  68 +               $(DESTDIR)$(MANDIR)/man1/python.1
  69
  70  # Install the library
  71  PLATDIR=       plat-$(MACHDEP)
  72 @@ -631,7 +631,7 @@
  73         do \
  74                 if test ! -d $$i; then \
  75                         echo "Creating directory $$i"; \
  76 -                       $(INSTALL) -d -m $(DIRMODE) $$i; \
  77 +                       $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \
  78                 else    true; \
  79                 fi; \
  80         done
  81 @@ -642,17 +642,17 @@
  82                 b=$(LIBDEST)/$$d; \
  83                 if test ! -d $$b; then \
  84                         echo "Creating directory $$b"; \
  85 -                       $(INSTALL) -d -m $(DIRMODE) $$b; \
  86 +                       $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$b; \
  87                 else    true; \
  88                 fi; \
  89         done
  90         @for i in $(srcdir)/Lib/*.py $(srcdir)/Lib/*.doc; \
  91         do \
  92                 if test -x $$i; then \
  93 -                       $(INSTALL_SCRIPT) $$i $(LIBDEST); \
  94 +                       $(INSTALL_SCRIPT) $$i $(DESTDIR)$(LIBDEST); \
  95                         echo $(INSTALL_SCRIPT) $$i $(LIBDEST); \
  96                 else \
  97 -                       $(INSTALL_DATA) $$i $(LIBDEST); \
  98 +                       $(INSTALL_DATA) $$i $(DESTDIR)$(LIBDEST); \
  99                         echo $(INSTALL_DATA) $$i $(LIBDEST); \
 100                 fi; \
 101         done
 102 @@ -672,27 +672,27 @@
 103                                 if test -d $$i; then continue; fi; \
 104                                 if test -x $$i; then \
 105                                     echo $(INSTALL_SCRIPT) $$i $$b; \
 106 -                                   $(INSTALL_SCRIPT) $$i $$b; \
 107 +                                   $(INSTALL_SCRIPT) $$i $(DESTDIR)$$b; \
 108                                 else \
 109                                     echo $(INSTALL_DATA) $$i $$b; \
 110 -                                   $(INSTALL_DATA) $$i $$b; \
 111 +                                   $(INSTALL_DATA) $$i $(DESTDIR)$$b; \
 112                                 fi;; \
 113                         esac; \
 114                 done; \
 115         done
 116 -       $(INSTALL_DATA) $(srcdir)/LICENSE $(LIBDEST)/LICENSE.txt
 117 +       $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
 118         PYTHONPATH=$(LIBDEST)  $(RUNSHARED) \
 119 -               ./$(BUILDPYTHON) -Wi -tt $(LIBDEST)/compileall.py \
 120 -               -x 'badsyntax|site-packages' $(LIBDEST)
 121 +               ./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
 122 +               -x 'badsyntax|site-packages' $(DESTDIR)$(LIBDEST)
 123         PYTHONPATH=$(LIBDEST) $(RUNSHARED) \
 124 -               ./$(BUILDPYTHON) -Wi -tt -O $(LIBDEST)/compileall.py \
 125 -               -x 'badsyntax|site-packages' $(LIBDEST)
 126 +               ./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
 127 +               -x 'badsyntax|site-packages' $(DESTDIR)$(LIBDEST)
 128         PYTHONPATH=$(LIBDEST)  $(RUNSHARED) \
 129 -               ./$(BUILDPYTHON) -Wi -t $(LIBDEST)/compileall.py \
 130 -               -x badsyntax $(LIBDEST)/site-packages
 131 +               ./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
 132 +               -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
 133         PYTHONPATH=$(LIBDEST) $(RUNSHARED) \
 134 -               ./$(BUILDPYTHON) -Wi -t -O $(LIBDEST)/compileall.py \
 135 -               -x badsyntax $(LIBDEST)/site-packages
 136 +               ./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
 137 +               -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
 138
 139  # Create the PLATDIR source directory, if one wasn't distributed..
 140  $(srcdir)/Lib/$(PLATDIR):
 141 @@ -711,16 +711,16 @@
 142         do \
 143                 if test ! -d $$i; then \
 144                         echo "Creating directory $$i"; \
 145 -                       $(INSTALL) -d -m $(DIRMODE) $$i; \
 146 +                       $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \
 147                 else    true; \
 148                 fi; \
 149         done
 150         @for i in $(srcdir)/Include/*.h; \
 151         do \
 152                 echo $(INSTALL_DATA) $$i $(INCLUDEPY); \
 153 -               $(INSTALL_DATA) $$i $(INCLUDEPY); \
 154 +               $(INSTALL_DATA) $$i $(DESTDIR)$(INCLUDEPY); \
 155         done
 156 -       $(INSTALL_DATA) pyconfig.h $(CONFINCLUDEPY)/pyconfig.h
 157 +       $(INSTALL_DATA) pyconfig.h $(DESTDIR)$(CONFINCLUDEPY)/pyconfig.h
 158
 159  # Install the library and miscellaneous stuff needed for extending/embedding
 160  # This goes into $(exec_prefix)
 161 @@ -730,53 +730,53 @@
 162         do \
 163                 if test ! -d $$i; then \
 164                         echo "Creating directory $$i"; \
 165 -                       $(INSTALL) -d -m $(DIRMODE) $$i; \
 166 +                       $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \
 167                 else    true; \
 168                 fi; \
 169         done
 170         @if test -d $(LIBRARY); then :; else \
 171                 if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
 172                         if test "$(SO)" = .dll; then \
 173 -                               $(INSTALL_DATA) $(LDLIBRARY) $(LIBPL) ; \
 174 +                               $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \
 175                         else \
 176 -                               $(INSTALL_DATA) $(LIBRARY) $(LIBPL)/$(LIBRARY) ; \
 177 -                               $(RANLIB) $(LIBPL)/$(LIBRARY) ; \
 178 +                               $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
 179 +                               $(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
 180                         fi; \
 181                 else \
 182                         echo Skip install of $(LIBRARY) - use make frameworkinstall; \
 183                 fi; \
 184         fi
 185 -       $(INSTALL_DATA) Modules/config.c $(LIBPL)/config.c
 186 -       $(INSTALL_DATA) Modules/$(MAINOBJ) $(LIBPL)/$(MAINOBJ)
 187 -       $(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(LIBPL)/config.c.in
 188 -       $(INSTALL_DATA) Makefile $(LIBPL)/Makefile
 189 -       $(INSTALL_DATA) Modules/Setup $(LIBPL)/Setup
 190 -       $(INSTALL_DATA) Modules/Setup.local $(LIBPL)/Setup.local
 191 -       $(INSTALL_DATA) Modules/Setup.config $(LIBPL)/Setup.config
 192 -       $(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(LIBPL)/makesetup
 193 -       $(INSTALL_SCRIPT) $(srcdir)/install-sh $(LIBPL)/install-sh
 194 +       $(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c
 195 +       $(INSTALL_DATA) Modules/$(MAINOBJ) $(DESTDIR)$(LIBPL)/$(MAINOBJ)
 196 +       $(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
 197 +       $(INSTALL_DATA) Makefile $(DESTDIR)$(LIBPL)/Makefile
 198 +       $(INSTALL_DATA) Modules/Setup $(DESTDIR)$(LIBPL)/Setup
 199 +       $(INSTALL_DATA) Modules/Setup.local $(DESTDIR)$(LIBPL)/Setup.local
 200 +       $(INSTALL_DATA) Modules/Setup.config $(DESTDIR)$(LIBPL)/Setup.config
 201 +       $(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup
 202 +       $(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
 203         @if [ -s Modules/python.exp -a \
 204                 "`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \
 205                 echo; echo "Installing support files for building shared extension modules on AIX:"; \
 206                 $(INSTALL_DATA) Modules/python.exp              \
 207 -                               $(LIBPL)/python.exp;            \
 208 +                               $(DESTDIR)$(LIBPL)/python.exp;          \
 209                 echo; echo "$(LIBPL)/python.exp";               \
 210                 $(INSTALL_SCRIPT) $(srcdir)/Modules/makexp_aix  \
 211 -                               $(LIBPL)/makexp_aix;            \
 212 +                               $(DESTDIR)$(LIBPL)/makexp_aix;          \
 213                 echo "$(LIBPL)/makexp_aix";                     \
 214                 $(INSTALL_SCRIPT) $(srcdir)/Modules/ld_so_aix   \
 215 -                               $(LIBPL)/ld_so_aix;             \
 216 +                               $(DESTDIR)$(LIBPL)/ld_so_aix;           \
 217                 echo "$(LIBPL)/ld_so_aix";                      \
 218                 echo; echo "See Misc/AIX-NOTES for details.";   \
 219         else true; \
 220         fi
 221         @case "$(MACHDEP)" in beos*) \
 222                 echo; echo "Installing support files for building shared extension modules on BeOS:"; \
 223 -               $(INSTALL_DATA) Misc/BeOS-NOTES $(LIBPL)/README;        \
 224 +               $(INSTALL_DATA) Misc/BeOS-NOTES $(DESTDIR)$(LIBPL)/README;      \
 225                 echo; echo "$(LIBPL)/README";                   \
 226 -               $(INSTALL_SCRIPT) Modules/ar_beos $(LIBPL)/ar_beos; \
 227 +               $(INSTALL_SCRIPT) Modules/ar_beos $(DESTDIR)$(LIBPL)/ar_beos; \
 228                 echo "$(LIBPL)/ar_beos";                        \
 229 -               $(INSTALL_SCRIPT) Modules/ld_so_beos $(LIBPL)/ld_so_beos; \
 230 +               $(INSTALL_SCRIPT) Modules/ld_so_beos $(DESTDIR)$(LIBPL)/ld_so_beos; \
 231                 echo "$(LIBPL)/ld_so_beos";                     \
 232                 echo; echo "See Misc/BeOS-NOTES for details.";  \
 233                 ;; \
 234 @@ -788,7 +788,8 @@
 235         $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \
 236                 --prefix=$(prefix) \
 237                 --install-scripts=$(BINDIR) \
 238 -               --install-platlib=$(DESTSHARED)
 239 +               --install-platlib=$(DESTSHARED) \
 240 +               --root=/$(DESTDIR)
 241
 242  # Here are a couple of targets for MacOSX again, to install a full
 243  # framework-based Python. frameworkinstall installs everything, the
 244 @@ -852,14 +853,16 @@
 245         --check-tkinter \
 246         --prefix=$(prefix) \
 247         --install-scripts=$(BINDIR) \
 248 -       --install-platlib=$(DESTSHARED)
 249 +       --install-platlib=$(DESTSHARED) \
 250 +       --root=/$(DESTDIR)
 251
 252  # This installs a few of the useful scripts in Tools/scripts
 253  scriptsinstall:
 254         SRCDIR=$(srcdir) $(RUNSHARED) \
 255         ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/setup.py install \
 256         --prefix=$(prefix) \
 257 -       --install-scripts=$(BINDIR)
 258 +       --install-scripts=$(BINDIR) \
 259 +       --root=/$(DESTDIR)
 260
 261  # Build the toplevel Makefile
 262  Makefile.pre: Makefile.pre.in config.status