diff options
| author | Doug Evans <dje@gnu.org> | 1993-10-07 18:40:43 +0000 |
|---|---|---|
| committer | Doug Evans <dje@gnu.org> | 1993-10-07 18:40:43 +0000 |
| commit | 9eb9177211dea7f3077b6fc6b56ad0bea812e485 (patch) | |
| tree | 773e2ef36e0ffcf217f855debee701b7e4e1bd0b | |
| parent | 888aa7a977cde28abe81a0b0714683950bbefab2 (diff) | |
| download | gcc-9eb9177211dea7f3077b6fc6b56ad0bea812e485.zip gcc-9eb9177211dea7f3077b6fc6b56ad0bea812e485.tar.gz gcc-9eb9177211dea7f3077b6fc6b56ad0bea812e485.tar.bz2 | |
(install-dir): Fix typo.
(install-common): Remove obsolete comment.
(install-common): Install native g++ only if not cross.
From-SVN: r5658
| -rw-r--r-- | gcc/Makefile.in | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/gcc/Makefile.in b/gcc/Makefile.in index b9ff77c..9f41141 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -1741,7 +1741,7 @@ install-float-h-cross: install-dir: -if [ -d $(libdir) ] ; then true ; else mkdir $(libdir) ; fi -if [ -d $(libdir)/gcc-lib ] ; then true ; else mkdir $(libdir)/gcc-lib ; fi -# This dir isn't curretly searched by cpp. +# This dir isn't currently searched by cpp. # -if [ -d $(libdir)/gcc-lib/include ] ; then true ; else mkdir $(libdir)/gcc-lib/include ; fi -if [ -d $(libdir)/gcc-lib/$(target) ] ; then true ; else mkdir $(libdir)/gcc-lib/$(target) ; fi -if [ -d $(libdir)/gcc-lib/$(target)/$(version) ] ; then true ; else mkdir $(libdir)/gcc-lib/$(target)/$(version) ; fi @@ -1759,8 +1759,6 @@ install-dir: -if [ -d $(mandir) ] ; then true ; else mkdir $(mandir) ; fi # Install the compiler executables built during cross compilation. -# Deps on $(srcdir)/g++ $(srcdir)/c++ would be natural here, -# but the latter would get confused with the target `c++'. install-common: native install-dir xgcc g++ $(EXTRA_PARTS) for file in $(COMPILERS); do \ if [ -f $$file ] ; then \ @@ -1802,6 +1800,13 @@ install-common: native install-dir xgcc g++ $(EXTRA_PARTS) rm -f $(bindir)/$(target)-gcc-1; \ ln $(bindir)/gcc $(bindir)/$(target)-gcc-1; \ mv $(bindir)/$(target)-gcc-1 $(bindir)/$(target)-gcc; \ + -if [ -f cc1plus ] ; then \ + rm -f $(bindir)/g++; \ + $(INSTALL_PROGRAM) g++ $(bindir)/g++; \ + chmod a+x $(bindir)/g++; \ + rm -f $(bindir)/c++; \ + ln $(bindir)/g++ $(bindir)/c++; \ + fi fi # Install protoize if it was compiled. -if [ -f protoize ]; \ @@ -1814,13 +1819,6 @@ install-common: native install-dir xgcc g++ $(EXTRA_PARTS) $(INSTALL_DATA) SYSCALLS.c.X $(libsubdir)/SYSCALLS.c.X; \ chmod a-x $(libsubdir)/SYSCALLS.c.X; \ fi - -if [ -f cc1plus ] ; then \ - rm -f $(bindir)/g++; \ - $(INSTALL_PROGRAM) g++ $(bindir)/g++; \ - chmod a+x $(bindir)/g++; \ - rm -f $(bindir)/c++; \ - ln $(bindir)/g++ $(bindir)/c++; \ - fi -rm -f $(libsubdir)/cpp $(INSTALL_PROGRAM) cpp $(libsubdir)/cpp |