[Python-checkins] CVS: python/dist/src Makefile.pre.in,1.32,1.33

Neil Schemenauer nascheme@users.sourceforge.net
Tue, 10 Apr 2001 16:03:37 -0700


Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv18384

Modified Files:
	Makefile.pre.in 
Log Message:
Use INSTALL_SCRIPT to install script files.  INSTALL_PROGRAM may try to
strip them.  Closes patch #406287.
				 CVS:  	do \
				 CVS:  		if test -x $$i; then \
				 CVS: -			$(INSTALL_PROGRAM) $$i $(LIBDEST); \
				 CVS: -			echo $(INSTALL_PROGRAM) $$i $(LIBDEST); \
				 CVS: +			$(INSTALL_SCRIPT) $$i $(LIBDEST); \
				 CVS: +			echo $(INSTALL_SCRIPT) $$i $(LIBDEST); \
				 CVS:  		else \
				 CVS:  			$(INSTALL_DATA) $$i $(LIBDEST); \
				 CVS:  			echo $(INSTALL_DATA) $$i $(LIBDEST); \
				 CVS: @@ -601,8 +602,8 @@
				 CVS:  			*) \
				 CVS:  				if test -d $$i; then continue; fi; \
				 CVS:  				if test -x $$i; then \
				 CVS: -				    echo $(INSTALL_PROGRAM) $$i $$b; \
				 CVS: -				    $(INSTALL_PROGRAM) $$i $$b; \
				 CVS: +				    echo $(INSTALL_SCRIPT) $$i $$b; \
				 CVS: +				    $(INSTALL_SCRIPT) $$i $$b; \
				 CVS:  				else \
				 CVS:  				    echo $(INSTALL_DATA) $$i $$b; \
				 CVS:  				    $(INSTALL_DATA) $$i $$b; \
				 CVS: @@ -666,8 +667,8 @@
				 CVS:  	$(INSTALL_DATA) Modules/Setup $(LIBPL)/Setup
				 CVS:  	$(INSTALL_DATA) Modules/Setup.local $(LIBPL)/Setup.local
				 CVS:  	$(INSTALL_DATA) Modules/Setup.config $(LIBPL)/Setup.config
				 CVS: -	$(INSTALL_PROGRAM) $(srcdir)/Modules/makesetup $(LIBPL)/makesetup
				 CVS: -	$(INSTALL_PROGRAM) $(srcdir)/install-sh $(LIBPL)/install-sh
				 CVS: +	$(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(LIBPL)/makesetup
				 CVS: +	$(INSTALL_SCRIPT) $(srcdir)/install-sh $(LIBPL)/install-sh
				 CVS:  	$(INSTALL_DATA) $(srcdir)/Misc/Makefile.pre.in $(LIBPL)/Makefile.pre.in
				 CVS:  	@if [ -s Modules/python.exp -a \
				 CVS:  		"`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \


Index: Makefile.pre.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Makefile.pre.in,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** Makefile.pre.in	2001/04/09 22:23:22	1.32
--- Makefile.pre.in	2001/04/10 23:03:35	1.33
***************
*** 44,47 ****
--- 44,48 ----
  INSTALL=	@INSTALL@
  INSTALL_PROGRAM=@INSTALL_PROGRAM@
+ INSTALL_SCRIPT= @INSTALL_SCRIPT@
  INSTALL_DATA=	@INSTALL_DATA@
  # Shared libraries must be installed with executable mode on some systems;
***************
*** 580,585 ****
  	do \
  		if test -x $$i; then \
! 			$(INSTALL_PROGRAM) $$i $(LIBDEST); \
! 			echo $(INSTALL_PROGRAM) $$i $(LIBDEST); \
  		else \
  			$(INSTALL_DATA) $$i $(LIBDEST); \
--- 581,586 ----
  	do \
  		if test -x $$i; then \
! 			$(INSTALL_SCRIPT) $$i $(LIBDEST); \
! 			echo $(INSTALL_SCRIPT) $$i $(LIBDEST); \
  		else \
  			$(INSTALL_DATA) $$i $(LIBDEST); \
***************
*** 602,607 ****
  				if test -d $$i; then continue; fi; \
  				if test -x $$i; then \
! 				    echo $(INSTALL_PROGRAM) $$i $$b; \
! 				    $(INSTALL_PROGRAM) $$i $$b; \
  				else \
  				    echo $(INSTALL_DATA) $$i $$b; \
--- 603,608 ----
  				if test -d $$i; then continue; fi; \
  				if test -x $$i; then \
! 				    echo $(INSTALL_SCRIPT) $$i $$b; \
! 				    $(INSTALL_SCRIPT) $$i $$b; \
  				else \
  				    echo $(INSTALL_DATA) $$i $$b; \
***************
*** 667,672 ****
  	$(INSTALL_DATA) Modules/Setup.local $(LIBPL)/Setup.local
  	$(INSTALL_DATA) Modules/Setup.config $(LIBPL)/Setup.config
! 	$(INSTALL_PROGRAM) $(srcdir)/Modules/makesetup $(LIBPL)/makesetup
! 	$(INSTALL_PROGRAM) $(srcdir)/install-sh $(LIBPL)/install-sh
  	$(INSTALL_DATA) $(srcdir)/Misc/Makefile.pre.in $(LIBPL)/Makefile.pre.in
  	@if [ -s Modules/python.exp -a \
--- 668,673 ----
  	$(INSTALL_DATA) Modules/Setup.local $(LIBPL)/Setup.local
  	$(INSTALL_DATA) Modules/Setup.config $(LIBPL)/Setup.config
! 	$(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(LIBPL)/makesetup
! 	$(INSTALL_SCRIPT) $(srcdir)/install-sh $(LIBPL)/install-sh
  	$(INSTALL_DATA) $(srcdir)/Misc/Makefile.pre.in $(LIBPL)/Makefile.pre.in
  	@if [ -s Modules/python.exp -a \
***************
*** 676,683 ****
  				$(LIBPL)/python.exp;		\
  		echo; echo "$(LIBPL)/python.exp";		\
! 		$(INSTALL_PROGRAM) $(srcdir)/Modules/makexp_aix	\
  				$(LIBPL)/makexp_aix;		\
  		echo "$(LIBPL)/makexp_aix";			\
! 		$(INSTALL_PROGRAM) $(srcdir)/Modules/ld_so_aix	\
  				$(LIBPL)/ld_so_aix;		\
  		echo "$(LIBPL)/ld_so_aix";			\
--- 677,684 ----
  				$(LIBPL)/python.exp;		\
  		echo; echo "$(LIBPL)/python.exp";		\
! 		$(INSTALL_SCRIPT) $(srcdir)/Modules/makexp_aix	\
  				$(LIBPL)/makexp_aix;		\
  		echo "$(LIBPL)/makexp_aix";			\
! 		$(INSTALL_SCRIPT) $(srcdir)/Modules/ld_so_aix	\
  				$(LIBPL)/ld_so_aix;		\
  		echo "$(LIBPL)/ld_so_aix";			\
***************
*** 689,695 ****
  		$(INSTALL_DATA) Misc/BeOS-NOTES $(LIBPL)/README;	\
  		echo; echo "$(LIBPL)/README";			\
! 		$(INSTALL_PROGRAM) Modules/ar_beos $(LIBPL)/ar_beos; \
  		echo "$(LIBPL)/ar_beos";			\
! 		$(INSTALL_PROGRAM) Modules/ld_so_beos $(LIBPL)/ld_so_beos; \
  		echo "$(LIBPL)/ld_so_beos";			\
  		echo; echo "See Misc/BeOS-NOTES for details.";	\
--- 690,696 ----
  		$(INSTALL_DATA) Misc/BeOS-NOTES $(LIBPL)/README;	\
  		echo; echo "$(LIBPL)/README";			\
! 		$(INSTALL_SCRIPT) Modules/ar_beos $(LIBPL)/ar_beos; \
  		echo "$(LIBPL)/ar_beos";			\
! 		$(INSTALL_SCRIPT) Modules/ld_so_beos $(LIBPL)/ld_so_beos; \
  		echo "$(LIBPL)/ld_so_beos";			\
  		echo; echo "See Misc/BeOS-NOTES for details.";	\