From a2d884314bfe9bfdab801275fa33155beb777197 Mon Sep 17 00:00:00 2001 From: Masafumi Max NAKANE Date: Fri, 19 Sep 1997 09:29:05 +0000 Subject: Some patches submitted as PR are not suitable to be committed blindly and previous changes to this port was one of them. This commit fixes: - We definetely need to check the existence of ${PREFIX}/dir and generate it if needed before install-info gets invoked. - Use empty definition of STRIP instead of changing every appearance of ${INSTALL_SCRIPT} in Makefile.in to ${INSTALL} especially since this port installs no files that need to be stripped. - No need to add rule to regenerate .info file when there's one in the distributed Makefile.in. - Instead of removing old piece of .info files in post-install target, leave it to the .texi.info: rule in the distributed Makefile. --- devel/gnu-automake/files/patch-ab | 49 ++++++++------------------------------- 1 file changed, 10 insertions(+), 39 deletions(-) (limited to 'devel/gnu-automake/files/patch-ab') diff --git a/devel/gnu-automake/files/patch-ab b/devel/gnu-automake/files/patch-ab index 00b7a640a19e..72099145a3dc 100644 --- a/devel/gnu-automake/files/patch-ab +++ b/devel/gnu-automake/files/patch-ab @@ -1,40 +1,11 @@ ---- Makefile.in.orig Fri Sep 19 06:13:16 1997 -+++ Makefile.in Fri Sep 19 06:15:31 1997 -@@ -131,11 +131,11 @@ - $(mkinstalldirs) $(bindir) - @list='$(bin_SCRIPTS)'; for p in $$list; do \ - if test -f $$p; then \ -- echo " $(INSTALL_SCRIPT) $$p $(bindir)/`echo $$p|sed '$(transform)'`"; \ -- $(INSTALL_SCRIPT) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \ -+ echo " $(INSTALL) $$p $(bindir)/`echo $$p|sed '$(transform)'`"; \ -+ $(INSTALL) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \ - else if test -f $(srcdir)/$$p; then \ -- echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(bindir)/`echo $$p|sed '$(transform)'`"; \ -- $(INSTALL_SCRIPT) $(srcdir)/$$p $(bindir)/`echo $$p|sed '$(transform)'`; \ -+ echo " $(INSTALL) $(srcdir)/$$p $(bindir)/`echo $$p|sed '$(transform)'`"; \ -+ $(INSTALL) $(srcdir)/$$p $(bindir)/`echo $$p|sed '$(transform)'`; \ - else :; fi; fi; \ - done +--- Makefile.in.orig Mon Jun 23 11:25:50 1997 ++++ Makefile.in Fri Sep 19 18:19:19 1997 +@@ -196,7 +196,7 @@ + .texi.info: + @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] + cd $(srcdir) \ +- && $(MAKEINFO) `echo $< | sed 's,.*/,,'` ++ && $(MAKEINFO) --no-split `echo $< | sed 's,.*/,,'` -@@ -150,11 +150,11 @@ - $(mkinstalldirs) $(pkgdatadir) - @list='$(pkgdata_SCRIPTS)'; for p in $$list; do \ - if test -f $$p; then \ -- echo " $(INSTALL_SCRIPT) $$p $(pkgdatadir)/`echo $$p|sed '$(transform)'`"; \ -- $(INSTALL_SCRIPT) $$p $(pkgdatadir)/`echo $$p|sed '$(transform)'`; \ -+ echo " $(INSTALL) $$p $(pkgdatadir)/`echo $$p|sed '$(transform)'`"; \ -+ $(INSTALL) $$p $(pkgdatadir)/`echo $$p|sed '$(transform)'`; \ - else if test -f $(srcdir)/$$p; then \ -- echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(pkgdatadir)/`echo $$p|sed '$(transform)'`"; \ -- $(INSTALL_SCRIPT) $(srcdir)/$$p $(pkgdatadir)/`echo $$p|sed '$(transform)'`; \ -+ echo " $(INSTALL) $(srcdir)/$$p $(pkgdatadir)/`echo $$p|sed '$(transform)'`"; \ -+ $(INSTALL) $(srcdir)/$$p $(pkgdatadir)/`echo $$p|sed '$(transform)'`; \ - else :; fi; fi; \ - done - -@@ -569,3 +569,5 @@ - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: -+.texi.info: -+ makeinfo --no-split $(TEXINFOS) + .texi.dvi: + TEXINPUTS=$(srcdir):$$TEXINPUTS \ -- cgit v1.2.3