From a7a7820865d05bec3d2d79ec2d2cc3dcf6e73bb0 Mon Sep 17 00:00:00 2001
From: aoliva <aoliva@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 12 Mar 2003 04:18:34 +0000
Subject: [PATCH] * g++.1: Remove. * Make-lang.in (c++.generated-manpages):
 Build cp/g++.1. (cp/g++.1): Build it from scratch in the build tree.
 (c++.install-man): Depend on it.  Install it from the build tree.
 (c++.mostlyclean): Clean it.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@64214 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/cp/ChangeLog    |  8 ++++++++
 gcc/cp/Make-lang.in | 17 +++++++++++++----
 gcc/cp/g++.1        |  1 -
 3 files changed, 21 insertions(+), 5 deletions(-)
 delete mode 100644 gcc/cp/g++.1

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 9dcd1c7c2cd..a8788f270b3 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,11 @@
+2003-03-12  Alexandre Oliva  <aoliva@redhat.com>
+
+	* g++.1: Remove.
+	* Make-lang.in (c++.generated-manpages): Build cp/g++.1.
+	(cp/g++.1): Build it from scratch in the build tree.
+	(c++.install-man): Depend on it.  Install it from the build tree.
+	(c++.mostlyclean): Clean it.
+
 2003-03-11  Mark Mitchell  <mark@codesourcery.com>
 
 	PR c++/9924
diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
index 39e84155e79..1659dc16ed4 100644
--- a/gcc/cp/Make-lang.in
+++ b/gcc/cp/Make-lang.in
@@ -119,7 +119,7 @@ c++.tags: force
 
 c++.info: 
 c++.dvi:
-c++.generated-manpages:
+c++.generated-manpages: cp/g++.1
 
 #
 # Install hooks:
@@ -164,15 +164,23 @@ c++.install-common: installdirs
 
 c++.install-info: 
 
-c++.install-man: installdirs $(srcdir)/cp/g++.1
+cp/g++.1:
+	-rm -f $@
+	if [ "$(ALL)" = all.cross ]; then \
+	  echo ".so man1/$(GCC_CROSS_NAME).1" > $@ ; \
+	else \
+	  echo ".so man1/$(GCC_INSTALL_NAME).1" > $@ ; \
+	fi
+
+c++.install-man: installdirs cp/g++.1
 	-if [ -f cc1plus$(exeext) ] ; then \
 	  if [ -f g++-cross$(exeext) ] ; then \
 	    rm -f $(DESTDIR)$(man1dir)/$(GXX_CROSS_NAME)$(man1ext); \
-	    $(INSTALL_DATA) $(srcdir)/cp/g++.1 $(DESTDIR)$(man1dir)/$(GXX_CROSS_NAME)$(man1ext); \
+	    $(INSTALL_DATA) cp/g++.1 $(DESTDIR)$(man1dir)/$(GXX_CROSS_NAME)$(man1ext); \
 	    chmod a-x $(DESTDIR)$(man1dir)/$(GXX_CROSS_NAME)$(man1ext); \
 	  else \
 	    rm -f $(DESTDIR)$(man1dir)/$(GXX_INSTALL_NAME)$(man1ext); \
-	    $(INSTALL_DATA) $(srcdir)/cp/g++.1 $(DESTDIR)$(man1dir)/$(GXX_INSTALL_NAME)$(man1ext); \
+	    $(INSTALL_DATA) cp/g++.1 $(DESTDIR)$(man1dir)/$(GXX_INSTALL_NAME)$(man1ext); \
 	    chmod a-x $(DESTDIR)$(man1dir)/$(GXX_INSTALL_NAME)$(man1ext); \
 	  fi; \
 	else true; fi
@@ -190,6 +198,7 @@ c++.uninstall:
 # We just have to delete files specific to us.
 
 c++.mostlyclean:
+	-rm -f cp/g++.1
 	-rm -f cp/*$(objext)
 	-rm -f cp/*$(coverageexts)
 c++.clean:
diff --git a/gcc/cp/g++.1 b/gcc/cp/g++.1
deleted file mode 100644
index a5be7bceeff..00000000000
--- a/gcc/cp/g++.1
+++ /dev/null
@@ -1 +0,0 @@
-.so man1/gcc.1
-- 
2.11.4.GIT