Subject: pkg/18634: devel/automake14 has hardcoded texinfo paths (this fixes build on Solaris)
To: None <gnats-bugs@gnats.netbsd.org>
From: Lubomir Sedlacik <salo@Xtrmntr.org>
List: netbsd-bugs
Date: 10/13/2002 01:45:10
>Number: 18634
>Category: pkg
>Synopsis: devel/automake14 has hardcoded texinfo paths (this fixes build on Solaris)
>Confidential: no
>Severity: critical
>Priority: high
>Responsible: pkg-manager
>State: open
>Class: sw-bug
>Submitter-Id: net
>Arrival-Date: Sat Oct 12 16:46:00 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Lubomir Sedlacik
>Release: NetBSD 1.6
>Organization:
>Environment:
>Description:
devel/automake14 has hardcoded paths for gnu texinfo binaries in
patches/patch-ab and doesn't use (yet included) texinfo.m4 provided
variables. this prevents build and installation on Solaris.
also there is really no need to patch uninstall-*: targets.
>How-To-Repeat:
try to build and install devel/automake14 on Solaris
>Fix:
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/devel/automake14/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo 3 Oct 2002 19:26:12 -0000 1.1.1.1
+++ distinfo 12 Oct 2002 23:38:01 -0000
@@ -3,4 +3,4 @@
SHA1 (automake-1.4-p6.tar.gz) = 330c75c98e6dcdf21cbb63cf94ced8ea564b9438
Size (automake-1.4-p6.tar.gz) = 375060 bytes
SHA1 (patch-aa) = e5e7f073a777be92f419173c9cc84dc42325a3a1
-SHA1 (patch-ab) = 02a374d68c7f46fecebb0c4179d3f4eb603b7103
+SHA1 (patch-ab) = 0891640e412a1ca157e2072a4f57235e7fbef703
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/devel/automake14/patches/patch-ab,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-ab
--- patches/patch-ab 3 Oct 2002 19:26:12 -0000 1.1.1.1
+++ patches/patch-ab 12 Oct 2002 23:38:01 -0000
@@ -1,17 +1,8 @@
$NetBSD: patch-ab,v 1.1.1.1 2002/10/03 19:26:12 wiz Exp $
--- Makefile.in.orig Sat Jul 27 23:09:40 2002
-+++ Makefile.in
-@@ -59,7 +59,7 @@ PRE_UNINSTALL = :
- POST_UNINSTALL = :
- APIVERSION = @APIVERSION@
- LN = @LN@
--MAKEINFO = @MAKEINFO@
-+MAKEINFO = /usr/bin/makeinfo
- PACKAGE = @PACKAGE@
- PERL = @PERL@
- TAR = @TAR@
-@@ -137,11 +137,11 @@ install-binSCRIPTS: $(bin_SCRIPTS)
++++ Makefile.in Sun Oct 13 01:28:34 2002
+@@ -137,11 +137,11 @@
$(mkinstalldirs) $(DESTDIR)$(bindir)
@list='$(bin_SCRIPTS)'; for p in $$list; do \
if test -f $$p; then \
@@ -27,7 +18,7 @@
else :; fi; fi; \
done
-@@ -183,7 +183,7 @@ DVIPS = dvips
+@@ -183,7 +183,7 @@
.texi.info:
@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
cd $(srcdir) \
@@ -36,13 +27,13 @@
.texi.dvi:
TEXINPUTS=.:$$TEXINPUTS \
-@@ -227,34 +227,26 @@ DVIPS = dvips
+@@ -227,23 +227,15 @@
install-info-am: $(INFO_DEPS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(infodir)
- @list='$(INFO_DEPS)'; \
- for file in $$list; do \
-- d=$(srcdir); \
+ d=$(srcdir); \
- for ifile in `cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
- if test -f $$d/$$ifile; then \
- echo " $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile"; \
@@ -50,7 +41,6 @@
- else : ; fi; \
- done; \
- done
-+ d=$(srcdir); \
+ if test -f $$d/automake.info; then \
+ echo " $(INSTALL_DATA) $$d/automake.info $(DESTDIR)$(infodir)/automake14.info"; \
+ $(INSTALL_DATA) $$d/automake.info $(DESTDIR)$(infodir)/automake14.info; \
@@ -62,26 +52,13 @@
- echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\
- install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\
- done; \
-+ @if $(SHELL) -c '/usr/bin/install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
-+ echo " /usr/bin/install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/automake14.info";\
-+ /usr/bin/install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/automake14.info || :;\
++ @if $(SHELL) -c '$(INSTALL_INFO) --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
++ echo " $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/automake14.info";\
++ $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/automake14.info || :;\
else : ; fi
uninstall-info:
- $(PRE_UNINSTALL)
-- @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
-+ @if $(SHELL) -c '/usr/bin/install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
- ii=yes; \
- else ii=; fi; \
- list='$(INFO_DEPS)'; \
- for file in $$list; do \
- test -z "$$ii" \
-- || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \
-+ || /usr/bin/install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \
- done
- @$(NORMAL_UNINSTALL)
- list='$(INFO_DEPS)'; \
-@@ -488,7 +480,6 @@ installcheck-am: installcheck-local
+@@ -488,7 +480,6 @@
installcheck: installcheck-recursive
install-exec-am: install-binSCRIPTS
@$(NORMAL_INSTALL)
>Release-Note:
>Audit-Trail:
>Unformatted: