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

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

[Richard Stallman]

Would someone please install this tiny change,
then ack?  (Please also thank Mark Davies.)

------- 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
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_9mbSFYx34JxGvzJ"
Subject: use INSTALL_SCRIPT in lib-src
X-Spam-Status: No, score=0.3 required=5.0 tests=FORGED_RCVD_HELO,
	UPPERCASE_25_50 autolearn=no version=3.0.4

- --Boundary-00=_9mbSFYx34JxGvzJ
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

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.

cheers
mark

- --Boundary-00=_9mbSFYx34JxGvzJ
Content-Type: text/x-diff;
  charset="us-ascii";
  name="patch-aa"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="patch-aa"

$NetBSD$

- --- 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
 

- --Boundary-00=_9mbSFYx34JxGvzJ
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
bug-gnu-emacs mailing list
bug-gnu-emacs@gnu.org
http://lists.gnu.org/mailman/listinfo/bug-gnu-emacs

- --Boundary-00=_9mbSFYx34JxGvzJ--
------- End of forwarded message -------

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

[Ramprasad]

On Fri, 2006-11-03 at 12:37, Richard Stallman wrote:
> Would someone please install this tiny change,
> then ack?  (Please also thank Mark Davies.)

Done !.

Thank you Mark Davies for the patch.

-
Ramprasad B

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

[Giorgos Keramidas]

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