--- gcc/Makefile.in.orig Fri Aug 13 03:46:55 1999 +++ gcc/Makefile.in Fri Sep 1 21:15:38 2000 @@ -400,7 +400,7 @@ MAYBE_USE_COLLECT2 = @maybe_use_collect2@ # It is convenient for configure to add the assignment at the beginning, # so don't override it here. -USE_COLLECT2 = collect2$(exeext) +USE_COLLECT2 = # List of extra C and assembler files to add to libgcc1.a. # Assembler files should have names ending in `.asm'. @@ -437,7 +437,7 @@ # A list of all the language-specific executables. # This is overridden by configure. -COMPILERS = cc1$(exeext) @all_compilers@ +COMPILERS = @all_compilers@ # List of things which should already be built whenever we try to use xgcc # to compile anything (without linking). @@ -2432,9 +2432,8 @@ # Copy the compiler files into directories where they will be run. # Install the driver last so that the window when things are # broken is small. -install-normal: install-common $(INSTALL_HEADERS) $(INSTALL_LIBGCC) \ - $(INSTALL_CPP) install-man install-info intl.install lang.install-normal \ - install-driver +install-normal: install-common \ + intl.install lang.install-normal # Do nothing while making gcc with a cross-compiler. The person who # makes gcc for the target machine has to know how to put a complete @@ -2507,51 +2506,6 @@ else true; \ fi; \ done - for file in $(EXTRA_PASSES) $(EXTRA_PROGRAMS) $(USE_COLLECT2) ..; do \ - if [ x"$$file" != x.. ]; then \ - rm -f $(libsubdir)/$$file; \ - $(INSTALL_PROGRAM) $$file $(libsubdir)/$$file; \ - else true; fi; \ - done - for file in $(EXTRA_PARTS) ..; do \ - if [ x"$$file" != x.. ]; then \ - rm -f $(libsubdir)/$$file; \ - $(INSTALL_DATA) $$file $(libsubdir)/$$file; \ - chmod a-x $(libsubdir)/$$file; \ - else true; fi; \ - done -# Don't mess with specs if it doesn't exist yet. - -if [ -f specs ] ; then \ - rm -f $(libsubdir)/specs; \ - $(INSTALL_DATA) specs $(libsubdir)/specs; \ - chmod a-x $(libsubdir)/specs; \ - fi -# Install protoize if it was compiled. - -if [ -f protoize$(exeext) ]; \ - then \ - if [ -f gcc-cross$(exeext) ] ; then \ - rm -f $(bindir)/$(PROTOIZE_CROSS_NAME)$(exeext); \ - $(INSTALL_PROGRAM) protoize$(exeext) $(bindir)/$(PROTOIZE_CROSS_NAME)$(exeext); \ - rm -f $(bindir)/$(UNPROTOIZE_CROSS_NAME)$(exeext); \ - $(INSTALL_PROGRAM) unprotoize$(exeext) $(bindir)/$(UNPROTOIZE_CROSS_NAME)$(exeext); \ - else \ - rm -f $(bindir)/$(PROTOIZE_INSTALL_NAME)$(exeext); \ - $(INSTALL_PROGRAM) protoize$(exeext) $(bindir)/$(PROTOIZE_INSTALL_NAME)$(exeext); \ - rm -f $(bindir)/$(UNPROTOIZE_INSTALL_NAME)$(exeext); \ - $(INSTALL_PROGRAM) unprotoize$(exeext) $(bindir)/$(UNPROTOIZE_INSTALL_NAME)$(exeext); \ - fi ; \ - rm -f $(libsubdir)/SYSCALLS.c.X; \ - $(INSTALL_DATA) SYSCALLS.c.X $(libsubdir)/SYSCALLS.c.X; \ - chmod a-x $(libsubdir)/SYSCALLS.c.X; \ - fi - -rm -f $(libsubdir)/cpp$(exeext) - $(INSTALL_PROGRAM) cpp$(exeext) $(libsubdir)/cpp$(exeext) -# Install gcov if it was compiled. - -if [ -f gcov$(exeext) ]; \ - then \ - rm -f $(bindir)/gcov$(exeext); \ - $(INSTALL_PROGRAM) gcov$(exeext) $(bindir)/$(GCOV_INSTALL_NAME)$(exeext); \ - fi # Install the driver program as $(target_alias)-gcc # and also as either gcc (if native) or $(gcc_tooldir)/bin/gcc.