Subject: pkg/4989: cvs and xemacs packages try to strip scripts
To: None <gnats-bugs@gnats.netbsd.org>
From: None <abs@mono.org>
List: netbsd-bugs
Date: 02/13/1998 20:59:19
>Number: 4989
>Category: pkg
>Synopsis: cvs and xemacs packages try to strip scripts
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: gnats-admin (GNATS administrator)
>State: open
>Class: sw-bug
>Submitter-Id: net
>Arrival-Date: Fri Feb 13 21:05:00 1998
>Last-Modified:
>Originator: David Brownlee
>Organization:
<a href="http://www.mono.org/">Monochrome</a>
>Release: 1.3
>Environment:
System: NetBSD lapton.anim.dreamworks.com 1.3 NetBSD 1.3 (_LAPTON_) #0: Fri Jan 9 11:10:00 PST 1998 root@lapton.anim.dreamworks.com:/usr/src/sys/arch/i386/compile/_LAPTON_ i386
>Description:
Both packages try to strip the scripts while installing, with obvious
problems.
>How-To-Repeat:
Try to build cvs or xemacs
>Fix:
The following patches 'Work for me'. Adopted the same approach as
seen in gtexinfo.
Should these use @INSTALL_SCRIPT@, similar to @INSTALL_DATA@?
CVS:
--- contrib/Makefile.in.orig Fri Feb 13 17:39:12 1998
+++ contrib/Makefile.in Fri Feb 13 17:41:51 1998
@@ -43,7 +43,7 @@
# Use cp if you don't have install.
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = ${INSTALL} -m 0555
DISTFILES = \
ChangeLog README .cvsignore intro.doc \
@@ -89,10 +89,10 @@
$(INSTALL_DATA) $(srcdir)/$$f $(libdir)/cvs/contrib/$$f; \
done
for f in $(CONTRIB_PROGS) ; do\
- $(INSTALL_PROGRAM) $$f $(libdir)/cvs/contrib/$$f; \
+ $(INSTALL_SCRIPT) $$f $(libdir)/cvs/contrib/$$f; \
done
for f in $(PROGS) ; do\
- $(INSTALL_PROGRAM) $$f $(bindir)/$$f; \
+ $(INSTALL_SCRIPT) $$f $(bindir)/$$f; \
done
.PHONY: install
XEMACS:
--- lib-src/Makefile.in.in.orig Fri Feb 13 18:39:45 1998
+++ lib-src/Makefile.in.in Fri Feb 13 18:40:20 1998
@@ -55,6 +55,7 @@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = ${INSTALL} -m 555
INSTALL_DATA = @INSTALL_DATA@
## ========================== Lists of Files ===========================
@@ -197,7 +198,7 @@
if test `(cd ${archlibdir} && $(pwd))` \
!= `(cd ${srcdir} && $(pwd))`; then \
for f in ${SCRIPTS}; do \
- (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$$f ${archlibdir}/$$f); \
+ (cd .. && $(INSTALL_SCRIPT) ${srcdir}/$$f ${archlibdir}/$$f); \
done ; \
fi
@@ -210,7 +211,7 @@
(cd .. && $(INSTALL_PROGRAM) lib-src/$${file} ${bindir}/$${file}) ; \
done
for file in ${INSTALLABLE_SCRIPTS} ; do \
- (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/$${file}) ; \
+ (cd .. && $(INSTALL_SCRIPT) ${srcdir}/$${file} ${bindir}/$${file}) ; \
done
uninstall:
>Audit-Trail:
>Unformatted: