From 3cf6a4654dde9c6a8df473a4b534cdb9638aee9b Mon Sep 17 00:00:00 2001 From: manfred Date: Thu, 19 Nov 1998 06:49:46 +0000 Subject: [PATCH] gcc/ChangeLog: 1998-10-24 Andreas Schwab * Makefile.in (mandir): Set to @mandir@. (man1dir): New variable to hold the former value of $(mandir). Replace all uses of $(mandir) by $(man1dir). gcc/cp/ChangeLog: 1998-11-14 Manfred Hollstein * Make-lang.in (mandir): Replace all uses of $(mandir) by $(man1dir). gcc/f/ChangeLog: 1998-11-14 Manfred Hollstein * Make-lang.in (mandir): Replace all uses of $(mandir) by $(man1dir). git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@23708 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 6 ++++++ gcc/Makefile.in | 39 ++++++++++++++++++++------------------- gcc/cp/ChangeLog | 4 ++++ gcc/cp/Make-lang.in | 16 ++++++++-------- gcc/f/ChangeLog | 4 ++++ gcc/f/Make-lang.in | 16 ++++++++-------- 6 files changed, 50 insertions(+), 35 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9c6aab2..0b37183 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +1998-11-19 Andreas Schwab + + * Makefile.in (mandir): Set to @mandir@. + (man1dir): New variable to hold the former value of $(mandir). + Replace all uses of $(mandir) by $(man1dir). + Wed Nov 18 16:31:28 1998 Jim Wilson * reload.c (find_reloads_address_part): If have a CONST_INT, create diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 4eb83c4..64d242f 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -289,7 +289,8 @@ exeext = @host_exeext@ build_exeext = @build_exeext@ # Directory in which to put man pages. -mandir = @mandir@/man1 +mandir = @mandir@ +man1dir = $(mandir)/man1 # Directory in which to find other cross-compilation tools and headers. # Used in install-cross. tooldir = $(libsubdir)/$(unlibsubdir)/../$(target_alias) @@ -2366,12 +2367,12 @@ installdirs: -if [ -d $(tooldir) ] ; then true ; else mkdir $(tooldir) ; chmod a+rx $(tooldir) ; fi -if [ -d $(assertdir) ] ; then true ; else mkdir $(assertdir) ; chmod a+rx $(assertdir) ; fi -if [ -d $(infodir) ] ; then true ; else mkdir $(infodir) ; chmod a+rx $(infodir) ; fi -# We don't use mkdir -p to create the parents of mandir, +# We don't use mkdir -p to create the parents of man1dir, # because some systems don't support it. -# Instead, we use this technique to create the immediate parent of mandir. - -parent=`echo $(mandir)|sed -e 's@/[^/]*$$@@'`; \ +# Instead, we use this technique to create the immediate parent of man1dir. + -parent=`echo $(man1dir)|sed -e 's@/[^/]*$$@@'`; \ if [ -d $$parent ] ; then true ; else mkdir $$parent ; chmod a+rx $$parent ; fi - -if [ -d $(mandir) ] ; then true ; else mkdir $(mandir) ; chmod a+rx $(mandir) ; fi + -if [ -d $(man1dir) ] ; then true ; else mkdir $(man1dir) ; chmod a+rx $(man1dir) ; fi # Install the compiler executables built during cross compilation. install-common: native installdirs $(EXTRA_PARTS) lang.install-common @@ -2467,17 +2468,17 @@ install-info: doc installdirs lang.install-info # Install the man pages. install-man: installdirs $(srcdir)/gcc.1 $(srcdir)/cccp.1 lang.install-man -if [ -f gcc-cross$(exeext) ] ; then \ - rm -f $(mandir)/$(GCC_CROSS_NAME)$(manext); \ - $(INSTALL_DATA) $(srcdir)/gcc.1 $(mandir)/$(GCC_CROSS_NAME)$(manext); \ - chmod a-x $(mandir)/$(GCC_CROSS_NAME)$(manext); \ + rm -f $(man1dir)/$(GCC_CROSS_NAME)$(manext); \ + $(INSTALL_DATA) $(srcdir)/gcc.1 $(man1dir)/$(GCC_CROSS_NAME)$(manext); \ + chmod a-x $(man1dir)/$(GCC_CROSS_NAME)$(manext); \ else \ - rm -f $(mandir)/$(GCC_INSTALL_NAME)$(manext); \ - $(INSTALL_DATA) $(srcdir)/gcc.1 $(mandir)/$(GCC_INSTALL_NAME)$(manext); \ - chmod a-x $(mandir)/$(GCC_INSTALL_NAME)$(manext); \ + rm -f $(man1dir)/$(GCC_INSTALL_NAME)$(manext); \ + $(INSTALL_DATA) $(srcdir)/gcc.1 $(man1dir)/$(GCC_INSTALL_NAME)$(manext); \ + chmod a-x $(man1dir)/$(GCC_INSTALL_NAME)$(manext); \ fi - -rm -f $(mandir)/cccp$(manext) - -$(INSTALL_DATA) $(srcdir)/cccp.1 $(mandir)/cccp$(manext) - -chmod a-x $(mandir)/cccp$(manext) + -rm -f $(man1dir)/cccp$(manext) + -$(INSTALL_DATA) $(srcdir)/cccp.1 $(man1dir)/cccp$(manext) + -chmod a-x $(man1dir)/cccp$(manext) # Install the library. install-libgcc: libgcc.a installdirs @@ -2575,11 +2576,11 @@ uninstall: lang.uninstall -rm -rf $(bindir)/protoize$(exeext) -rm -rf $(bindir)/unprotoize$(exeext) -rm -rf $(bindir)/gcov$(exeext) - -rm -rf $(mandir)/$(GCC_INSTALL_NAME)$(manext) - -rm -rf $(mandir)/$(GCC_CROSS_NAME)$(manext) - -rm -rf $(mandir)/cccp$(manext) - -rm -rf $(mandir)/protoize$(manext) - -rm -rf $(mandir)/unprotoize$(manext) + -rm -rf $(man1dir)/$(GCC_INSTALL_NAME)$(manext) + -rm -rf $(man1dir)/$(GCC_CROSS_NAME)$(manext) + -rm -rf $(man1dir)/cccp$(manext) + -rm -rf $(man1dir)/protoize$(manext) + -rm -rf $(man1dir)/unprotoize$(manext) -rm -f $(infodir)/cpp.info* $(infodir)/gcc.info* # # These targets are for the dejagnu testsuites. The file site.exp diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 367be02..287c7cc 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +1998-11-19 Manfred Hollstein + + * Make-lang.in (mandir): Replace all uses of $(mandir) by $(man1dir). + 1998-11-19 Jason Merrill * semantics.c (begin_class_definition): Call diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in index 20641a3..1d40af6 100644 --- a/gcc/cp/Make-lang.in +++ b/gcc/cp/Make-lang.in @@ -246,13 +246,13 @@ c++.install-info: c++.install-man: $(srcdir)/cp/g++.1 -if [ -f cc1plus$(exeext) ] ; then \ if [ -f g++-cross$(exeext) ] ; then \ - rm -f $(mandir)/$(GXX_CROSS_NAME)$(manext); \ - $(INSTALL_DATA) $(srcdir)/cp/g++.1 $(mandir)/$(GXX_CROSS_NAME)$(manext); \ - chmod a-x $(mandir)/$(GXX_CROSS_NAME)$(manext); \ + rm -f $(man1dir)/$(GXX_CROSS_NAME)$(manext); \ + $(INSTALL_DATA) $(srcdir)/cp/g++.1 $(man1dir)/$(GXX_CROSS_NAME)$(manext); \ + chmod a-x $(man1dir)/$(GXX_CROSS_NAME)$(manext); \ else \ - rm -f $(mandir)/$(GXX_INSTALL_NAME)$(manext); \ - $(INSTALL_DATA) $(srcdir)/cp/g++.1 $(mandir)/$(GXX_INSTALL_NAME)$(manext); \ - chmod a-x $(mandir)/$(GXX_INSTALL_NAME)$(manext); \ + rm -f $(man1dir)/$(GXX_INSTALL_NAME)$(manext); \ + $(INSTALL_DATA) $(srcdir)/cp/g++.1 $(man1dir)/$(GXX_INSTALL_NAME)$(manext); \ + chmod a-x $(man1dir)/$(GXX_INSTALL_NAME)$(manext); \ fi; \ else true; fi @@ -263,8 +263,8 @@ c++.uninstall: -rm -rf $(bindir)/$(GXX_CROSS_NAME)$(exeext) -rm -rf $(bindir)/$(DEMANGLER_INSTALL_NAME)$(exeext) -rm -rf $(bindir)/$(DEMANGLER_CROSS_NAME)$(exeext) - -rm -rf $(mandir)/$(GXX_INSTALL_NAME)$(manext) - -rm -rf $(mandir)/$(GXX_CROSS_NAME)$(manext) + -rm -rf $(man1dir)/$(GXX_INSTALL_NAME)$(manext) + -rm -rf $(man1dir)/$(GXX_CROSS_NAME)$(manext) # # Clean hooks: # A lot of the ancillary files are deleted by the main makefile. diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog index 10da10d..c279bb5 100644 --- a/gcc/f/ChangeLog +++ b/gcc/f/ChangeLog @@ -1,3 +1,7 @@ +1998-11-19 Manfred Hollstein + + * Make-lang.in (mandir): Replace all uses of $(mandir) by $(man1dir). + Mon Nov 9 23:15:39 1998 Jeffrey A Law (law@cygnus.com) * g77.texi, news.texi: Updates from Craig. diff --git a/gcc/f/Make-lang.in b/gcc/f/Make-lang.in index a180760..8544f1c 100644 --- a/gcc/f/Make-lang.in +++ b/gcc/f/Make-lang.in @@ -384,13 +384,13 @@ f77.install-man: $(srcdir)/f/g77.1 esac -if [ -f lang-f77 -a -f f771$(exeext) ] ; then \ if [ -f g77-cross$(exeext) ] ; then \ - rm -f $(mandir)/$(G77_CROSS_NAME)$(manext); \ - $(INSTALL_DATA) $(srcdir)/f/g77.1 $(mandir)/$(G77_CROSS_NAME)$(manext); \ - chmod a-x $(mandir)/$(G77_CROSS_NAME)$(manext); \ + rm -f $(man1dir)/$(G77_CROSS_NAME)$(manext); \ + $(INSTALL_DATA) $(srcdir)/f/g77.1 $(man1dir)/$(G77_CROSS_NAME)$(manext); \ + chmod a-x $(man1dir)/$(G77_CROSS_NAME)$(manext); \ else \ - rm -f $(mandir)/$(G77_INSTALL_NAME)$(manext); \ - $(INSTALL_DATA) $(srcdir)/f/g77.1 $(mandir)/$(G77_INSTALL_NAME)$(manext); \ - chmod a-x $(mandir)/$(G77_INSTALL_NAME)$(manext); \ + rm -f $(man1dir)/$(G77_INSTALL_NAME)$(manext); \ + $(INSTALL_DATA) $(srcdir)/f/g77.1 $(man1dir)/$(G77_INSTALL_NAME)$(manext); \ + chmod a-x $(man1dir)/$(G77_INSTALL_NAME)$(manext); \ fi; \ else true; fi @@ -408,8 +408,8 @@ f77.uninstall: -if [ -f lang-f77 ]; then \ rm -rf $(bindir)/$(G77_INSTALL_NAME)$(exeext); \ rm -rf $(bindir)/$(G77_CROSS_NAME)$(exeext); \ - rm -rf $(mandir)/$(G77_INSTALL_NAME)$(manext); \ - rm -rf $(mandir)/$(G77_CROSS_NAME)$(manext); \ + rm -rf $(man1dir)/$(G77_INSTALL_NAME)$(manext); \ + rm -rf $(man1dir)/$(G77_CROSS_NAME)$(manext); \ rm -rf $(infodir)/g77.info*; \ fi # -- 2.7.4