Makefile.in (install-man): Use $(CPP_INSTALL_NAME) and $(GCOV_INSTALL_NAME) to instal...

	* Makefile.in (install-man): Use $(CPP_INSTALL_NAME) and
	$(GCOV_INSTALL_NAME) to install manpages.  Remove generic rule
	for installing .1 manpages.  Add rules for installing cpp
	and gcov manpages under their installed names.

From-SVN: r77745

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c96cd87648711b4b5f3fd4929156db99666fdefd..1d08e5309e7859f456f770c38cf334cc690a5023 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2004-02-12  Geoffrey Keating  <geoffk@apple.com>
+
+       * Makefile.in (install-man): Use $(CPP_INSTALL_NAME) and
+       $(GCOV_INSTALL_NAME) to install manpages.  Remove generic rule
+       for installing .1 manpages.  Add rules for installing cpp
+       and gcov manpages under their installed names.
+
 2004-02-12  Alexandre Oliva  <aoliva@redhat.com>
 
        * configure.ac (gcc_cv_ld): Don't set to LD if target is not

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 22640847394a4508344553efe345882a5d68db7a..2779e821903bd5878340b877586756ac211bf3ba 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -2974,23 +2974,28 @@ $(DESTDIR)$(infodir)/%.info: doc/%.info installdirs
 # Install the man pages.
 install-man: installdirs lang.install-man \
        $(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext) \
-       $(DESTDIR)$(man1dir)/cpp$(man1ext) \
-       $(DESTDIR)$(man1dir)/gcov$(man1ext) \
+       $(DESTDIR)$(man1dir)/$(CPP_INSTALL_NAME)$(man1ext) \
+       $(DESTDIR)$(man1dir)/$(GCOV_INSTALL_NAME)$(man1ext) \
        $(DESTDIR)$(man7dir)/fsf-funding$(man7ext) \
        $(DESTDIR)$(man7dir)/gfdl$(man7ext) \
        $(DESTDIR)$(man7dir)/gpl$(man7ext)
 
-$(DESTDIR)$(man1dir)/%$(man1ext): doc/%.1
+$(DESTDIR)$(man7dir)/%$(man7ext): doc/%.7
        -rm -f $@
        -$(INSTALL_DATA) $< $@
        -chmod a-x $@
 
-$(DESTDIR)$(man7dir)/%$(man7ext): doc/%.7
+$(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext): doc/gcc.1
        -rm -f $@
-       -$(INSTALL_DATA) $< $@
+       -$(INSTALL_DATA) $< $@ 
        -chmod a-x $@
 
-$(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext): doc/gcc.1
+$(DESTDIR)$(man1dir)/$(CPP_INSTALL_NAME)$(man1ext): doc/cpp.1
+       -rm -f $@
+       -$(INSTALL_DATA) $< $@ 
+       -chmod a-x $@
+
+$(DESTDIR)$(man1dir)/$(GCOV_INSTALL_NAME)$(man1ext): doc/gcov.1
        -rm -f $@
        -$(INSTALL_DATA) $< $@ 
        -chmod a-x $@