logo

live-bootstrap

Mirror of <https://github.com/fosslinux/live-bootstrap>

destdir.patch (7881B)

    

  1. SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space>
  3. SPDX-License-Identifier: Python-2.0.1
  5. Python 2.0 does not support DESTDIR, so add it in.
  7. --- Python-2.0.1/Makefile.in	2022-10-21 17:56:48.034287578 +1100
  8. +++ Python-2.0.1/Makefile.in	2022-10-21 18:07:54.267542882 +1100
  9. @@ -224,16 +224,16 @@
  10.  
  11.  # Install the interpreter (by creating a hard link to python$(VERSION))
  12.  bininstall:	altbininstall
  13. -		-if test -f $(BINDIR)/python$(EXE); \
  14. -		then rm -f $(BINDIR)/python$(EXE); \
  15. +		-if test -f $(DESTDIR)$(BINDIR)/python$(EXE); \
  16. +		then rm -f $(DESTDIR)$(BINDIR)/python$(EXE); \
  17.  		else true; \
  18.  		fi
  19. -		(cd $(BINDIR); $(LN) python$(VERSION)$(EXE) python$(EXE))
  20. +		(cd $(DESTDIR)$(BINDIR); $(LN) python$(VERSION)$(EXE) python$(EXE))
  21.  
  22.  # Install the interpreter with $(VERSION) affixed
  23.  # This goes into $(exec_prefix)
  24.  altbininstall:	python$(EXE)
  25. -		@for i in $(BINDIR); \
  26. +		@for i in $(DESTDIR)$(BINDIR); \
  27.  		do \
  28.  			if test ! -d $$i; then \
  29.  				echo "Creating directory $$i"; \
  30. @@ -242,15 +242,15 @@
  31.  			else	true; \
  32.  			fi; \
  33.  		done
  34. -		$(INSTALL_PROGRAM) python$(EXE) $(BINDIR)/python$(VERSION)$(EXE)
  35. +		$(INSTALL_PROGRAM) python$(EXE) $(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE)
  36.  		if test -f libpython$(VERSION).so; then \
  37. -			$(INSTALL_DATA) libpython$(VERSION).so $(LIBDIR); \
  38. +			$(INSTALL_DATA) libpython$(VERSION).so $(DESTDIR)$(LIBDIR); \
  39.  		else	true; \
  40.  		fi
  41.  
  42.  # Install the manual page
  43.  maninstall:
  44. -		@for i in $(MANDIR) $(MANDIR)/man1; \
  45. +		@for i in $(DESTDIR)$(MANDIR) $(DESTDIR)$(MANDIR)/man1; \
  46.  		do \
  47.  			if test ! -d $$i; then \
  48.  				echo "Creating directory $$i"; \
  49. @@ -260,7 +260,7 @@
  50.  			fi; \
  51.  		done
  52.  		$(INSTALL_DATA) $(srcdir)/Misc/python.man \
  53. -			$(MANDIR)/man1/python.1
  54. +			$(DESTDIR)$(MANDIR)/man1/python.1
  55.  
  56.  # Install the library
  57.  PLATDIR=	plat-$(MACHDEP)
  58. @@ -269,7 +269,7 @@
  59.  LIBSUBDIRS=	lib-old lib-tk site-packages test test/output encodings \
  60.  		distutils distutils/command $(XMLLIBSUBDIRS) curses $(MACHDEPS)
  61.  libinstall:	python $(srcdir)/Lib/$(PLATDIR)
  62. -		@for i in $(SCRIPTDIR) $(LIBDEST); \
  63. +		@for i in $(DESTDIR)$(SCRIPTDIR) $(DESTDIR)$(LIBDEST); \
  64.  		do \
  65.  			if test ! -d $$i; then \
  66.  				echo "Creating directory $$i"; \
  67. @@ -278,11 +278,11 @@
  68.  			else	true; \
  69.  			fi; \
  70.  		done
  71. -		@for d in $(LIBSUBDIRS); \
  72. +		@for d in $(DESTDIR)$(LIBSUBDIRS); \
  73.  		do \
  74.  			a=$(srcdir)/Lib/$$d; \
  75.  			if test ! -d $$a; then continue; else true; fi; \
  76. -			b=$(LIBDEST)/$$d; \
  77. +			b=$(DESTDIR)$(LIBDEST)/$$d; \
  78.  			if test ! -d $$b; then \
  79.  				echo "Creating directory $$b"; \
  80.  				mkdir $$b; \
  81. @@ -293,18 +293,18 @@
  82.  		@for i in $(srcdir)/Lib/*.py $(srcdir)/Lib/*.doc; \
  83.  		do \
  84.  			if test -x $$i; then \
  85. -				$(INSTALL_PROGRAM) $$i $(LIBDEST); \
  86. -				echo $(INSTALL_PROGRAM) $$i $(LIBDEST); \
  87. +				$(INSTALL_PROGRAM) $$i $(DESTDIR)$(LIBDEST); \
  88. +				echo $(INSTALL_PROGRAM) $$i $(DESTDIR)$(LIBDEST); \
  89.  			else \
  90. -				$(INSTALL_DATA) $$i $(LIBDEST); \
  91. -				echo $(INSTALL_DATA) $$i $(LIBDEST); \
  92. +				$(INSTALL_DATA) $$i $(DESTDIR)$(LIBDEST); \
  93. +				echo $(INSTALL_DATA) $$i $(DESTDIR)$(LIBDEST); \
  94.  			fi; \
  95.  		done
  96.  		@for d in $(LIBSUBDIRS); \
  97.  		do \
  98.  			a=$(srcdir)/Lib/$$d; \
  99.  			if test ! -d $$a; then continue; else true; fi; \
  100. -			b=$(LIBDEST)/$$d; \
  101. +			b=$(DESTDIR)$(LIBDEST)/$$d; \
  102.  			for i in $$a/*; \
  103.  			do \
  104.  				case $$i in \
  105. @@ -324,11 +324,11 @@
  106.  				esac; \
  107.  			done; \
  108.  		done
  109. -		$(INSTALL_DATA) $(srcdir)/LICENSE $(LIBDEST)/LICENSE.txt
  110. -		PYTHONPATH=$(LIBDEST) \
  111. -			./python$(EXE) -tt $(LIBDEST)/compileall.py $(LIBDEST)
  112. -		PYTHONPATH=$(LIBDEST) \
  113. -			./python$(EXE) -O $(LIBDEST)/compileall.py $(LIBDEST)
  114. +		$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
  115. +		PYTHONPATH=$(DESTDIR)$(LIBDEST) \
  116. +			./python$(EXE) -tt $(DESTDIR)$(LIBDEST)/compileall.py $(DESTDIR)$(LIBDEST)
  117. +		PYTHONPATH=$(DESTDIR)$(LIBDEST) \
  118. +			./python$(EXE) -O $(DESTDIR)$(LIBDEST)/compileall.py $(DESTDIR)$(LIBDEST)
  119.  
  120.  # Create the PLATDIR source directory, if one wasn't distributed..
  121.  $(srcdir)/Lib/$(PLATDIR):
  122. @@ -344,25 +344,25 @@
  123.  inclinstall:
  124.  		@for i in $(INCLDIRSTOMAKE); \
  125.  		do \
  126. -			if test ! -d $$i; then \
  127. -				echo "Creating directory $$i"; \
  128. -				mkdir $$i; \
  129. -				chmod $(DIRMODE) $$i; \
  130. +			if test ! -d $(DESTDIR)$$i; then \
  131. +				echo "Creating directory $(DESTDIR)$$i"; \
  132. +				mkdir $(DESTDIR)$$i; \
  133. +				chmod $(DIRMODE) $(DESTDIR)$$i; \
  134.  			else	true; \
  135.  			fi; \
  136.  		done
  137.  		@for i in $(srcdir)/Include/*.h; \
  138.  		do \
  139. -			echo $(INSTALL_DATA) $$i $(INCLUDEPY); \
  140. -			$(INSTALL_DATA) $$i $(INCLUDEPY); \
  141. +			echo $(INSTALL_DATA) $$i $(DESTDIR)$(INCLUDEPY); \
  142. +			$(INSTALL_DATA) $$i $(DESTDIR)$(INCLUDEPY); \
  143.  		done
  144. -		$(INSTALL_DATA) config.h $(CONFINCLUDEPY)/config.h
  145. +		$(INSTALL_DATA) config.h $(DESTDIR)$(CONFINCLUDEPY)/config.h
  146.  
  147.  # Install the library and miscellaneous stuff needed for extending/embedding
  148.  # This goes into $(exec_prefix)
  149.  LIBPL=		$(LIBP)/config
  150.  libainstall:	all
  151. -		@for i in $(LIBDIR) $(LIBP) $(LIBPL); \
  152. +		@for i in $(DESTDIR)$(LIBDIR) $(DESTDIR)$(LIBP) $(DESTDIR)$(LIBPL); \
  153.  		do \
  154.  			if test ! -d $$i; then \
  155.  				echo "Creating directory $$i"; \
  156. @@ -372,19 +372,19 @@
  157.  			fi; \
  158.  		done
  159.  		@if test -d $(LIBRARY); then :; else \
  160. -			$(INSTALL_DATA) $(LIBRARY) $(LIBPL)/$(LIBRARY) ; \
  161. -			$(RANLIB) $(LIBPL)/$(LIBRARY) ; \
  162. +			$(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
  163. +			$(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
  164.  		fi
  165. -		$(INSTALL_DATA) Modules/config.c $(LIBPL)/config.c
  166. -		$(INSTALL_DATA) Modules/python.o $(LIBPL)/python.o
  167. -		$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(LIBPL)/config.c.in
  168. -		$(INSTALL_DATA) Modules/Makefile $(LIBPL)/Makefile
  169. -		$(INSTALL_DATA) Modules/Setup $(LIBPL)/Setup
  170. -		$(INSTALL_DATA) Modules/Setup.local $(LIBPL)/Setup.local
  171. -		$(INSTALL_DATA) Modules/Setup.config $(LIBPL)/Setup.config
  172. -		$(INSTALL_PROGRAM) $(srcdir)/Modules/makesetup $(LIBPL)/makesetup
  173. -		$(INSTALL_PROGRAM) $(srcdir)/install-sh $(LIBPL)/install-sh
  174. -		$(INSTALL_DATA) $(srcdir)/Misc/Makefile.pre.in $(LIBPL)/Makefile.pre.in
  175. +		$(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c
  176. +		$(INSTALL_DATA) Modules/python.o $(DESTDIR)$(LIBPL)/python.o
  177. +		$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
  178. +		$(INSTALL_DATA) Modules/Makefile $(DESTDIR)$(LIBPL)/Makefile
  179. +		$(INSTALL_DATA) Modules/Setup $(DESTDIR)$(LIBPL)/Setup
  180. +		$(INSTALL_DATA) Modules/Setup.local $(DESTDIR)$(LIBPL)/Setup.local
  181. +		$(INSTALL_DATA) Modules/Setup.config $(DESTDIR)$(LIBPL)/Setup.config
  182. +		$(INSTALL_PROGRAM) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup
  183. +		$(INSTALL_PROGRAM) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
  184. +		$(INSTALL_DATA) $(srcdir)/Misc/Makefile.pre.in $(DESTDIR)$(LIBPL)/Makefile.pre.in
  185.  		@if [ -s Modules/python.exp -a \
  186.  			"`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \
  187.  			echo; echo "Installing support files for building shared extension modules on AIX:"; \
  188. @@ -425,6 +425,7 @@
  189.  			CCSHARED="$(CCSHARED)" \
  190.  			LINKFORSHARED="$(LINKFORSHARED)" \
  191.  			DESTSHARED="$(DESTSHARED)" \
  192. +			DESTDIR="$(DESTDIR)" \
  193.  			prefix="$(prefix)" \
  194.  			exec_prefix="$(exec_prefix)" \
  195.  			sharedinstall
  196. --- Python-2.0.1/Modules/Makefile.pre.in	2022-10-21 17:56:44.635251486 +1100
  197. +++ Python-2.0.1/Modules/Makefile.pre.in	2022-10-21 17:57:00.124415957 +1100
  198. @@ -240,7 +240,7 @@
  199.  sharedinstall:	$(DESTSHARED) $(SHAREDMODS)
  200.  		-for i in X $(SHAREDMODS); do \
  201.  			if test $$i != X; \
  202. -			then $(INSTALL_SHARED) $$i $(DESTSHARED)/$$i; \
  203. +			then $(INSTALL_SHARED) $$i $(DESTDIR)$(DESTSHARED)/$$i; \
  204.  			fi; \
  205.  		done
  206.  
  207. @@ -249,10 +249,10 @@
  208.  $(DESTSHARED): 
  209.  		@for i in $(DESTDIRS); \
  210.  		do \
  211. -			if test ! -d $$i; then \
  212. -				echo "Creating directory $$i"; \
  213. -				mkdir $$i; \
  214. -				chmod 755 $$i; \
  215. +			if test ! -d $(DESTDIR)$$i; then \
  216. +				echo "Creating directory $(DESTDIR)$$i"; \
  217. +				mkdir $(DESTDIR)$$i; \
  218. +				chmod 755 $(DESTDIR)$$i; \
  219.  			else	true; \
  220.  			fi; \
  221.  		done