From e658449ebb92607c3f339ce9e9787f60d1fb6afc Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Fri, 16 Feb 2001 03:54:02 +0000 Subject: [PATCH] Makefile.in (install-common): Don't depend on installdirs here. gcc/: 2001-01-20 Jim Meyering * Makefile.in (install-common): Don't depend on installdirs here. Instead, make each of the lang.install-common targets (e.g., c++.install-common in cp/Make-lang.in) depend on it. (install-driver): Depend on installdirs. gcc/ch: 2001-02-15 Jim Meyering * Make-lang.in (CHILL.install-common): Depend on `installdirs'. (CHILL.install-info): Likewise. gcc/cp: 2001-02-15 Jim Meyering * Make-lang.in (c++.install-common): Depend on installdirs. (c++.install-info): Likewise (c++.install-man): Likewise gcc/java: 2001-02-15 Jim Meyering * Make-lang.in (java.install-common): Depend on `installdirs'. (java.install-info): Likewise. From-SVN: r39744 --- gcc/ChangeLog | 7 +++++++ gcc/Makefile.in | 4 ++-- gcc/ch/ChangeLog | 5 +++++ gcc/ch/Make-lang.in | 4 ++-- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/Make-lang.in | 6 +++--- gcc/java/ChangeLog | 5 +++++ gcc/java/Make-lang.in | 4 ++-- 8 files changed, 32 insertions(+), 9 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1eb36ab0b37..821950ed0b2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2001-01-20 Jim Meyering + + * Makefile.in (install-common): Don't depend on installdirs here. + Instead, make each of the lang.install-common targets (e.g., + c++.install-common in cp/Make-lang.in) depend on it. + (install-driver): Depend on installdirs. + Thu Feb 15 21:30:26 2001 Richard Kenner * flow.c (tidy_fallthru_edge): Never end block on line number NOTE. diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 17bb19152e8..a78183ef931 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -2493,7 +2493,7 @@ installdirs: -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 +install-common: native $(EXTRA_PARTS) lang.install-common for file in $(COMPILERS); do \ if [ -f $$file ] ; then \ rm -f $(libsubdir)/$$file; \ @@ -2552,7 +2552,7 @@ install-common: native installdirs $(EXTRA_PARTS) lang.install-common # Install the driver program as $(target_alias)-gcc # and also as either gcc (if native) or $(gcc_tooldir)/bin/gcc. -install-driver: xgcc$(exeext) +install-driver: installdirs xgcc$(exeext) -if [ -f gcc-cross$(exeext) ] ; then \ rm -f $(bindir)/$(GCC_CROSS_NAME)$(exeext); \ $(INSTALL_PROGRAM) gcc-cross$(exeext) $(bindir)/$(GCC_CROSS_NAME)$(exeext); \ diff --git a/gcc/ch/ChangeLog b/gcc/ch/ChangeLog index 8356aa22a4a..f1d742a1a3f 100644 --- a/gcc/ch/ChangeLog +++ b/gcc/ch/ChangeLog @@ -1,3 +1,8 @@ +2001-02-15 Jim Meyering + + * Make-lang.in (CHILL.install-common): Depend on `installdirs'. + (CHILL.install-info): Likewise. + Sun Feb 4 15:52:44 2001 Richard Kenner * convert.c (convert): Call abort instead of fatal. diff --git a/gcc/ch/Make-lang.in b/gcc/ch/Make-lang.in index 6c8154f003e..54751289794 100644 --- a/gcc/ch/Make-lang.in +++ b/gcc/ch/Make-lang.in @@ -127,7 +127,7 @@ chill.dvi: $(srcdir)/ch/chill.texi $(srcdir)/extend.texi $(srcdir)/invoke.texi $ CHILL.install-normal: # Install the driver program -CHILL.install-common: +CHILL.install-common: installdirs -if [ -f cc1chill$(exeext) ] ; then \ if [ -f chill.install ] ; then \ if [ -f gcc-cross$(exeext) ]; then \ @@ -144,7 +144,7 @@ CHILL.install-common: # Don't delete $(infodir)/ch.info* unless there's actually new # docs to install (in case LANGUAGES didn't contain chill earlier). -CHILL.install-info: +CHILL.install-info: installdirs -cd $(srcdir)/ch; for i in chill.info*; do \ rm -f $(infodir)/chill.info*; \ realfile=`echo $$i | sed -e 's|.*/\([^/]*\)$$|\1|'`; \ diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index a65b21edc23..c6cc85e5221 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2001-02-15 Jim Meyering + + * Make-lang.in (c++.install-common): Depend on installdirs. + (c++.install-info): Likewise + (c++.install-man): Likewise + 2001-02-15 Mark Mitchell * typeck2.c (build_m_component_ref): Robustify. diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in index de3c596094c..fc114a9892b 100644 --- a/gcc/cp/Make-lang.in +++ b/gcc/cp/Make-lang.in @@ -147,7 +147,7 @@ c++.install-normal: # Install the driver program as $(target)-g++ # and also as either g++ (if native) or $(tooldir)/bin/g++. -c++.install-common: +c++.install-common: installdirs -if [ -f cc1plus$(exeext) ] ; then \ if [ -f g++-cross$(exeext) ] ; then \ rm -f $(bindir)/$(GXX_CROSS_NAME)$(exeext); \ @@ -185,7 +185,7 @@ c++.install-common: fi ; \ fi -c++.install-info: c++.info +c++.install-info: c++.info installdirs if [ -f cc1plus$(exeext) ] ; then \ if [ -f $(srcdir)/cp/g++int.info ]; then \ rm -f $(infodir)/g++int.info*; \ @@ -202,7 +202,7 @@ c++.install-info: c++.info else true; fi; \ else true; fi -c++.install-man: $(srcdir)/cp/g++.1 +c++.install-man: installdirs $(srcdir)/cp/g++.1 -if [ -f cc1plus$(exeext) ] ; then \ if [ -f g++-cross$(exeext) ] ; then \ rm -f $(man1dir)/$(GXX_CROSS_NAME)$(manext); \ diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 62ad05d435b..b300cba4334 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +2001-02-15 Jim Meyering + + * Make-lang.in (java.install-common): Depend on `installdirs'. + (java.install-info): Likewise. + 2001-02-15 Bryce McKinlay * Make-lang.in (jvspec.o): Modify rule to match that of cp/g++spec.o. diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in index 49080ed8ad9..3a85d3234a9 100644 --- a/gcc/java/Make-lang.in +++ b/gcc/java/Make-lang.in @@ -158,7 +158,7 @@ java.dvi: java/gcj.dvi # Nothing to do here. java.install-normal: -java.install-common: +java.install-common: installdirs -if [ -f $(GCJ)$(exeext) ]; then \ if [ -f $(GCJ)-cross$(exeext) ]; then \ rm -f $(bindir)/$(JAVA_CROSS_NAME)$(exeext); \ @@ -184,7 +184,7 @@ java.uninstall: -rm -rf $(bindir)/$(JAVA_INSTALL_NAME)$(exeext) -rm -rf $(bindir)/$(JAVA_CROSS_NAME)$(exeext) -java.install-info: +java.install-info: installdirs if [ -f jc1$(exeext) ] ; then \ if [ -f $(srcdir)/java/gcj.info ]; then \ rm -f $(infodir)/gcj.info*; \