diff options
| author | Alexandre Oliva <aoliva@redhat.com> | 2003-03-12 04:18:34 +0000 |
|---|---|---|
| committer | Alexandre Oliva <aoliva@gcc.gnu.org> | 2003-03-12 04:18:34 +0000 |
| commit | 2bfe542b566e2356be946644ec9b20affcc45584 (patch) | |
| tree | 4622da55e570135b6701a2be35d62240d4cbb82d /gcc/cp | |
| parent | 7358f10d14bcd6ef86ac37c88e3c22a2e0635e9a (diff) | |
| download | gcc-2bfe542b566e2356be946644ec9b20affcc45584.zip gcc-2bfe542b566e2356be946644ec9b20affcc45584.tar.gz gcc-2bfe542b566e2356be946644ec9b20affcc45584.tar.bz2 | |
g++.1: Remove.
* 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.
From-SVN: r64214
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/cp/Make-lang.in | 17 | ||||
| -rw-r--r-- | gcc/cp/g++.1 | 1 |
3 files changed, 21 insertions, 5 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 9dcd1c7..a8788f2 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 39e8415..1659dc1 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 a5be7bc..0000000 --- a/gcc/cp/g++.1 +++ /dev/null @@ -1 +0,0 @@ -.so man1/gcc.1 |