Re: [mark@mcs.vuw.ac.nz: use INSTALL_SCRIPT in lib-src]

[Giorgos Keramidas <keramida@ceid.upatras.gr>]

On 2006-11-03 02:07, Richard Stallman <rms@gnu.org> wrote:
> Would someone please install this tiny change,
> then ack?  (Please also thank Mark Davies.)

FWIW, we 've been building the editors/emacs-devel port of FreeBSD with
this patch for quite some time now, so I can verify that this is a safe
change to make :)

> ------- Start of forwarded message -------
> From: Mark Davies <mark@mcs.vuw.ac.nz>
> To: bug-gnu-emacs@gnu.org
> Date: Thu, 2 Nov 2006 22:26:20 +1300
> Subject: use INSTALL_SCRIPT in lib-src
> 
> The Makefile in lib-src attempts to install some scripts so should use 
> INSTALL_SCRIPT instead of INSTALL_PROGRAM in case they are different.
> 
> patch attached to fix.

> - --- lib-src/Makefile.in.orig	2006-03-03 21:02:31.000000000 +0900
> +++ lib-src/Makefile.in
> @@ -94,6 +94,7 @@ gameuser=@gameuser@
>  INSTALL = @INSTALL@
>  INSTALL_PROGRAM = @INSTALL_PROGRAM@
>  INSTALL_DATA = @INSTALL_DATA@
> +INSTALL_SCRIPT = @INSTALL_SCRIPT@
>  # By default, we uphold the dignity of our programs.
>  INSTALL_STRIP =
>  
> @@ -319,7 +320,7 @@ $(DESTDIR)${archlibdir}: all
>          if [ `(cd $(DESTDIR)${archlibdir} && /bin/pwd)` \
>               != `(cd ${srcdir} && /bin/pwd)` ]; then \
>  	  for file in ${SCRIPTS}; do \
> - -	    $(INSTALL_PROGRAM) ${srcdir}/$$file $(DESTDIR)${archlibdir}/$$file; \
> +	    $(INSTALL_SCRIPT) ${srcdir}/$$file $(DESTDIR)${archlibdir}/$$file; \
>  	  done ; \
>  	fi
>  
> @@ -331,7 +332,7 @@ install: $(DESTDIR)${archlibdir}
>  	  chmod a+rx $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'`; \
>  	done
>  	for file in ${INSTALLABLE_SCRIPTS} ; do \
> - -	  $(INSTALL_PROGRAM) ${srcdir}/$${file} $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'`  ; \
> +	  $(INSTALL_SCRIPT) ${srcdir}/$${file} $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'`  ; \
>  	  chmod a+rx $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'`; \
>  	done