[PATCH] gold: drop old cygnus install hack

[PATCH] gold: drop old cygnus install hack

[Mike Frysinger]

The gold subdir doesn't actually have a manual, so this hack doesn't
do anything.  Plus the automake cygnus option was removed years ago
by Simon in d0ac1c44885daf68f631befa37e ("Bump to autoconf 2.69 and
automake 1.15.1").  So delete it here.
---
 gold/Makefile.am |  4 ----
 gold/Makefile.in | 24 ++++++++++--------------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/gold/Makefile.am b/gold/Makefile.am
index d6d859bcb8ca..2e406716f29a 100644
--- a/gold/Makefile.am
+++ b/gold/Makefile.am
@@ -243,10 +243,6 @@ install-exec-local: ld-new$(EXEEXT)
 	  fi; \
 	fi
 
-# We want install to imply install-info as per GNU standards, despite
-# the cygnus option.
-install-data-local: install-info
-
 POTFILES= $(CCFILES) $(HFILES) $(TARGETSOURCES)
 
 po/POTFILES.in: @MAINT@ Makefile
diff --git a/gold/Makefile.in b/gold/Makefile.in
index 9ce44e96ecf4..516eace5aa58 100644
--- a/gold/Makefile.in
+++ b/gold/Makefile.in
@@ -1499,7 +1499,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am:
 
 install-dvi: install-dvi-recursive
 
@@ -1557,15 +1557,15 @@ uninstall-am: uninstall-binPROGRAMS
 	cscopelist-am ctags ctags-am distclean distclean-compile \
 	distclean-generic distclean-hdr distclean-tags dvi dvi-am html \
 	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-data-local install-dvi \
-	install-dvi-am install-exec install-exec-am install-exec-local \
-	install-html install-html-am install-info install-info-am \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am recheck tags tags-am \
-	uninstall uninstall-am uninstall-binPROGRAMS
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-exec-local install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
+	ps ps-am recheck tags tags-am uninstall uninstall-am \
+	uninstall-binPROGRAMS
 
 .PRECIOUS: Makefile
 
@@ -1604,10 +1604,6 @@ install-exec-local: ld-new$(EXEEXT)
 	  fi; \
 	fi
 
-# We want install to imply install-info as per GNU standards, despite
-# the cygnus option.
-install-data-local: install-info
-
 po/POTFILES.in: @MAINT@ Makefile
 	for f in $(POTFILES); do echo $$f; done | LC_ALL=C sort > tmp \
 	  && mv tmp $(srcdir)/po/POTFILES.in
-- 
2.34.1

Re: [PATCH] gold: drop old cygnus install hack

[Nick Clifton]

Hi Mike,

> The gold subdir doesn't actually have a manual, so this hack doesn't
> do anything.  Plus the automake cygnus option was removed years ago
> by Simon in d0ac1c44885daf68f631befa37e ("Bump to autoconf 2.69 and
> automake 1.15.1").  So delete it here.
> ---
>   gold/Makefile.am |  4 ----
>   gold/Makefile.in | 24 ++++++++++--------------
>   2 files changed, 10 insertions(+), 18 deletions(-)

Approved - please apply.

Cheers
   Nick