diff options
author | Kelley Cook <kcook@gcc.gnu.org> | 2004-01-21 02:01:55 +0000 |
---|---|---|
committer | R. Kelley Cook <kcook@gcc.gnu.org> | 2004-01-21 02:01:55 +0000 |
commit | a541f69dd201256fc90d4627ae2b937956d58e31 (patch) | |
tree | f0bc97de1632926bda2a9581fc5df41b7e33d0bc /gcc/cp/Make-lang.in | |
parent | abd3817fd52ffa5dc4b6de525225a35b35696c87 (diff) | |
download | gcc-a541f69dd201256fc90d4627ae2b937956d58e31.zip gcc-a541f69dd201256fc90d4627ae2b937956d58e31.tar.gz gcc-a541f69dd201256fc90d4627ae2b937956d58e31.tar.bz2 |
re PR other/12730 (manual page install broken with old Pod::man)
gcc/
2004-01-20 Kelley Cook <kcook@gcc.gnu.org>
PR bootstrap/12730
* configure.ac: Delete definition and subsitution of docdir.
Add info, man, srcman and srcinfo to target hooks. Create doc/
directory.
* configure: Regenerate.
* Makefile.in: Don't substitute docdir and delete all references
throughout.
(MAKEINFOFLAGS): Define.
(stmp-docobjdir): Delete.
(INFOFILES, MANFILES): Define.
(info): Call lang.info, srcinfo and lang.srcinfo.
(generated-manpages): Call lang.man, srcman and lang.srcman.
(srcinfo, srcman): New rules to copy back files to source directory.
(doc/%.info, doc/%.dvi, doc/%.1, doc/%.7): New implict rule.
(install-man): Revamp rule.
(clean): Update dvi directory.
(distclean): Delete TAGS from front end directorys.
(maintainer-clean): Delete all document files in source directory.
objc/Make-lang.in (objc.man, objc.info): Dummy entries.
(objc.srcman, objc.srcinfo): Likewise.
gcc/ada/
2004-01-20 Kelley Cook <kcook@gcc.gnu.org>
* Make-lang.in: Replace $(docdir) with doc.
(doc/gnat_ug_unx.info, doc/gnat_ug_vwx.info, doc/gnat_ug_vms.info
doc/gnat_ug_wnt.info, doc/gnat_rm.info, doc/gnat-style.info): Update
to use consistent MAKEINFO rule.
(ada.man, ada.srcman): Dummy entry.
(ADA_INFOFILES): Define.
(ada.info, ada.srcinfo): New rules.
gcc/cp/
2004-01-20 Kelley Cook <kcook@gcc.gnu.org>
* Make-lang.in: Replace $(docdir) with doc.
(c++.info, c++.srcinfo): Dummy entry.
(c++.man, c++.srcman): New rules.
(c++.install-man): Revamp rule.
gcc/f/
2004-01-20 Kelley Cook <kcook@gcc.gnu.org>
* Make-lang.in: Replace $(docdir) with doc.
(TEXI_G77_FILES): Define.
(f77.rebuilt): Delete.
(f77.srcextra): Add dependencies on f/BUGS and f/NEWS.
(f77.srcman, f77.srcinfo, f77.man, f77.info): New rules.
(doc/g77.info, doc/g77.dvi): Depend on TEXI_G77_FILES. Always build in
doc directory. Use $(MAKEINFOFLAGS).
(info, dvi, generated_manpages): Update to look in doc directory.
(f/BUGS, f/NEWS): Generate in build directory.
(f77.mostlyclean): Delete BUGS and NEWS from build directory.
(f77.maintainer-clean): Adjust to delete from source directory.
(f77.install-man): Revamp rule.
gcc/java/
2004-01-20 Kelley Cook <kcook@gcc.gnu.org>
* Make-lang.in: Replace $(docdir) with doc.
(java.info, java.srcinfo, java.man, java.srcman): New rules.
(java.install-man): Revamp rule.
gcc/treelang/
2004-01-20 Kelley Cook <kcook@gcc.gnu.org>
* Make-lang.in: Replace $(docdir) with doc.
(treelang.info, treelang.srcinfo): New rules.
(treelang.man, treelang.man): Dummy entries.
maintainer-scripts/
2004-01-20 Kelley Cook <kcook@gcc.gnu.org>
* gcc_release (build_sources): Delete call to make f77.rebuilt.
From-SVN: r76249
Diffstat (limited to 'gcc/cp/Make-lang.in')
-rw-r--r-- | gcc/cp/Make-lang.in | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in index c239e4b..41d21ec 100644 --- a/gcc/cp/Make-lang.in +++ b/gcc/cp/Make-lang.in @@ -108,6 +108,8 @@ c++.all.build: g++$(exeext) c++.all.cross: g++-cross$(exeext) c++.start.encap: g++$(exeext) c++.rest.encap: +c++.info: +c++.srcinfo: c++.srcextra: c++.tags: force @@ -115,7 +117,10 @@ c++.tags: force --regex='/DEFTREECODE [(]\([A-Z_]+\)/\1/' cp-tree.def; \ etags --include TAGS.sub --include ../TAGS.sub -generated-manpages:: $(docobjdir)/g++.1 +c++.man: doc/g++.1 + +c++.srcman: doc/g++.1 + -cp -p $^ $(srcdir)/doc check-c++ : check-g++ lang_checks += check-g++ @@ -157,15 +162,15 @@ c++.install-common: installdirs # We can't use links because not everyone supports them, and we can't use # .so because Irix 6.5 doesn't support them. So just copy the manpage. -$(docobjdir)/g++.1: $(docobjdir)/gcc.1 - cp $(docobjdir)/gcc.1 $(docobjdir)/g++.1 +doc/g++.1: doc/gcc.1 + cp doc/gcc.1 doc/g++.1 -c++.install-man: installdirs $(docobjdir)/g++.1 - -if [ -f cc1plus$(exeext) ] ; then \ - rm -f $(DESTDIR)$(man1dir)/$(GXX_INSTALL_NAME)$(man1ext); \ - $(INSTALL_DATA) $(docobjdir)/g++.1 $(DESTDIR)$(man1dir)/$(GXX_INSTALL_NAME)$(man1ext); \ - chmod a-x $(DESTDIR)$(man1dir)/$(GXX_INSTALL_NAME)$(man1ext); \ - else true; fi +c++.install-man: installdirs $(DESTDIR)$(man1dir)/$(GXX_INSTALL_NAME)$(man1ext) + +$(DESTDIR)$(man1dir)/$(GXX_INSTALL_NAME)$(man1ext): doc/g++.1 + -rm -f $@ + -$(INSTALL_DATA) $< $@ + -chmod a-x $@ c++.uninstall: -rm -rf $(DESTDIR)$(bindir)/$(CXX_INSTALL_NAME)$(exeext) @@ -177,7 +182,7 @@ c++.uninstall: # We just have to delete files specific to us. c++.mostlyclean: - -rm -f $(docobjdir)/g++.1 + -rm -f doc/g++.1 -rm -f cp/*$(objext) -rm -f cp/*$(coverageexts) c++.clean: |