aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormax <max@FreeBSD.org>1997-02-07 19:00:26 +0800
committermax <max@FreeBSD.org>1997-02-07 19:00:26 +0800
commit80cb3e0c2764d25c8ac4a4238e6ffe38b6065307 (patch)
tree60d572817a7dca72b1328cadc1fcdc587bcef444
parent6c2b4a540191d0c3caf27faeb37fbf3189f5bffd (diff)
downloadfreebsd-ports-gnome-80cb3e0c2764d25c8ac4a4238e6ffe38b6065307.tar.gz
freebsd-ports-gnome-80cb3e0c2764d25c8ac4a4238e6ffe38b6065307.tar.zst
freebsd-ports-gnome-80cb3e0c2764d25c8ac4a4238e6ffe38b6065307.zip
In Makefile.in, use install-info only if it exists as /usr/bin/install-info
and ${PREFIX}/info/dir exists.
-rw-r--r--devel/gmake/files/patch-aa16
-rw-r--r--devel/gmake381/files/patch-aa16
2 files changed, 20 insertions, 12 deletions
diff --git a/devel/gmake/files/patch-aa b/devel/gmake/files/patch-aa
index 6c9d091addb4..22a6c018ea98 100644
--- a/devel/gmake/files/patch-aa
+++ b/devel/gmake/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.in.orig Thu Aug 29 06:13:09 1996
-+++ Makefile.in Thu Feb 6 01:46:54 1997
+--- Makefile.in.orig Wed Aug 28 14:13:09 1996
++++ Makefile.in Fri Feb 7 02:42:44 1997
@@ -79,7 +79,7 @@
# Number to put on the man page filename.
manext = 1
@@ -18,16 +18,20 @@
$(bindir)/$(binprefix)make: make
$(INSTALL_PROGRAM) make $@.new
-@@ -206,7 +208,7 @@
+@@ -204,9 +206,10 @@
+ # line so we notice real errors from install-info.
+ # We use `$(SHELL) -c' because some shells do not
# fail gracefully when there is an unknown command.
- if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
+- if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
++ if $(SHELL) -c '/usr/bin/install-info --version' >/dev/null 2>&1; then \
if [ -r ./make.info ]; then dir=.; else dir=$(srcdir); fi; \
- install-info --infodir=$(infodir) $$dir/make.info; \
-+ install-info --info-dir=$(infodir) --defentry='* gmake: (make). GNU make utility' $$dir/make.info; \
++ if [ -e $(infodir)/dir ] ; then \
++ /usr/bin/install-info --info-dir=$(infodir) --defentry='* gmake: (make). GNU make utility' $$dir/make.info; fi ; \
else true; fi
$(mandir)/$(manprefix)make.$(manext): make.man
-@@ -250,7 +252,8 @@
+@@ -250,7 +253,8 @@
$(SHELL) config.status
glob/Makefile: config.status $(srcdir)/glob/Makefile.in
$(SHELL) config.status
diff --git a/devel/gmake381/files/patch-aa b/devel/gmake381/files/patch-aa
index 6c9d091addb4..22a6c018ea98 100644
--- a/devel/gmake381/files/patch-aa
+++ b/devel/gmake381/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.in.orig Thu Aug 29 06:13:09 1996
-+++ Makefile.in Thu Feb 6 01:46:54 1997
+--- Makefile.in.orig Wed Aug 28 14:13:09 1996
++++ Makefile.in Fri Feb 7 02:42:44 1997
@@ -79,7 +79,7 @@
# Number to put on the man page filename.
manext = 1
@@ -18,16 +18,20 @@
$(bindir)/$(binprefix)make: make
$(INSTALL_PROGRAM) make $@.new
-@@ -206,7 +208,7 @@
+@@ -204,9 +206,10 @@
+ # line so we notice real errors from install-info.
+ # We use `$(SHELL) -c' because some shells do not
# fail gracefully when there is an unknown command.
- if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
+- if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
++ if $(SHELL) -c '/usr/bin/install-info --version' >/dev/null 2>&1; then \
if [ -r ./make.info ]; then dir=.; else dir=$(srcdir); fi; \
- install-info --infodir=$(infodir) $$dir/make.info; \
-+ install-info --info-dir=$(infodir) --defentry='* gmake: (make). GNU make utility' $$dir/make.info; \
++ if [ -e $(infodir)/dir ] ; then \
++ /usr/bin/install-info --info-dir=$(infodir) --defentry='* gmake: (make). GNU make utility' $$dir/make.info; fi ; \
else true; fi
$(mandir)/$(manprefix)make.$(manext): make.man
-@@ -250,7 +252,8 @@
+@@ -250,7 +253,8 @@
$(SHELL) config.status
glob/Makefile: config.status $(srcdir)/glob/Makefile.in
$(SHELL) config.status