Commit 90961eff by Andreas Jaeger

Makefile.in (ORDINARY_FLAGS_TO_PASS): Also pass DESTDIR.


	* Makefile.in (ORDINARY_FLAGS_TO_PASS): Also pass DESTDIR.
	(install-gcc-tooldir, install-cpp, installdirs,
	install-common, install-driver, install-info, install-man,
	install-headers, install-include-dir, install-headers-tar,
	install-headers-cpio, install-headers-cp, install-mkheaders,
	install-collect2, uninstall): Prepend $(DESTDIR) to
	destination paths in all (un)installation commands.
	(install-driver): Rewrite $(LN) commands to support DESTDIR
	with "ln" as well as with "ln -s".
	(installdirs): Simply use mkinstalldirs.
	(install-libgcc, install-multilib): Also pass DESTDIR.
	* mklibgcc.in: Prepend $(DESTDIR) to $(libsubdir) in the
	installation destination variable ldir.
	* config/alpha/t-osf4, config/arm/t-netbsd,
	config/ia64/t-hpux, config/mips/t-iris5-6,
	config/pa/t-hpux-shlib, config/rs6000/t-aix43,
	config/rs6000/t-aix52, config/t-slibgcc-elf-ver,
	config/t-slibgcc-sld: Prepend $$(DESTDIR) to $$(slibdir)
	in the definition of SHLIB_INSTALL.
	* config/arc/t-arc (install-multilib-arc): Prepend $(DESTDIR) to
	$(libsubdir) in the installation commands.

From-SVN: r61076
parent 8b26829f
2003-01-09 Christian Cornelssen <ccorn@cs.tu-berlin.de>
* Makefile.in (ORDINARY_FLAGS_TO_PASS): Also pass DESTDIR.
(install-gcc-tooldir, install-cpp, installdirs,
install-common, install-driver, install-info, install-man,
install-headers, install-include-dir, install-headers-tar,
install-headers-cpio, install-headers-cp, install-mkheaders,
install-collect2, uninstall): Prepend $(DESTDIR) to
destination paths in all (un)installation commands.
(install-driver): Rewrite $(LN) commands to support DESTDIR
with "ln" as well as with "ln -s".
(installdirs): Simply use mkinstalldirs.
(install-libgcc, install-multilib): Also pass DESTDIR.
* mklibgcc.in: Prepend $(DESTDIR) to $(libsubdir) in the
installation destination variable ldir.
* config/alpha/t-osf4, config/arm/t-netbsd,
config/ia64/t-hpux, config/mips/t-iris5-6,
config/pa/t-hpux-shlib, config/rs6000/t-aix43,
config/rs6000/t-aix52, config/t-slibgcc-elf-ver,
config/t-slibgcc-sld: Prepend $$(DESTDIR) to $$(slibdir)
in the definition of SHLIB_INSTALL.
* config/arc/t-arc (install-multilib-arc): Prepend $(DESTDIR) to
$(libsubdir) in the installation commands.
2003-01-08 Kaz Kojima <kkojima@gcc.gnu.org> 2003-01-08 Kaz Kojima <kkojima@gcc.gnu.org>
* config/sh/sh.h (CASE_VECTOR_MODE): Use SImode for a * config/sh/sh.h (CASE_VECTOR_MODE): Use SImode for a
...@@ -391,7 +415,7 @@ Tue Jan 7 21:46:57 CET 2003 Jan Hubicka <jh@suse.cz> ...@@ -391,7 +415,7 @@ Tue Jan 7 21:46:57 CET 2003 Jan Hubicka <jh@suse.cz>
* fixinc/fixfixes.c(wrap_fix): the wrapper guard must be a function * fixinc/fixfixes.c(wrap_fix): the wrapper guard must be a function
of *both* the file name and the fix name. of *both* the file name and the fix name.
2002-01-04 John David Anglin <dave.anglin@nrc.ca> 2003-01-04 John David Anglin <dave.anglin@nrc.ca>
* config.gcc (hppa*64*-*-hpux11*): Define extra_parts. Don't use * config.gcc (hppa*64*-*-hpux11*): Define extra_parts. Don't use
collect2. collect2.
......
...@@ -690,6 +690,7 @@ ORDINARY_FLAGS_TO_PASS = \ ...@@ -690,6 +690,7 @@ ORDINARY_FLAGS_TO_PASS = \
"BISON=$(BISON)" \ "BISON=$(BISON)" \
"BISONFLAGS=$(BISONFLAGS)" \ "BISONFLAGS=$(BISONFLAGS)" \
"CFLAGS=$(CFLAGS) $(WARN_CFLAGS)" \ "CFLAGS=$(CFLAGS) $(WARN_CFLAGS)" \
"DESTDIR=$(DESTDIR)" \
"GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \ "GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \
"LDFLAGS=$(LDFLAGS)" \ "LDFLAGS=$(LDFLAGS)" \
"FLEX=$(FLEX)" \ "FLEX=$(FLEX)" \
...@@ -2388,7 +2389,7 @@ fixinc.sh: $(FIXINCSRCDIR)/mkfixinc.sh $(FIXINCSRCDIR)/fixincl.c \ ...@@ -2388,7 +2389,7 @@ fixinc.sh: $(FIXINCSRCDIR)/mkfixinc.sh $(FIXINCSRCDIR)/fixincl.c \
.PHONY: install-gcc-tooldir .PHONY: install-gcc-tooldir
install-gcc-tooldir: install-gcc-tooldir:
$(SHELL) ${srcdir}/mkinstalldirs $(gcc_tooldir) $(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(gcc_tooldir)
# Build fixed copies of system files. # Build fixed copies of system files.
stmp-fixinc: fixinc.sh gsyslimits.h stmp-fixinc: fixinc.sh gsyslimits.h
...@@ -2778,173 +2779,163 @@ install: install-common $(INSTALL_HEADERS) $(INSTALL_LIBGCC) \ ...@@ -2778,173 +2779,163 @@ install: install-common $(INSTALL_HEADERS) $(INSTALL_LIBGCC) \
# Handle cpp installation. # Handle cpp installation.
install-cpp: cpp$(exeext) install-cpp: cpp$(exeext)
-if [ -f gcc-cross$(exeext) ] ; then \ -if [ -f gcc-cross$(exeext) ] ; then \
rm -f $(bindir)/$(CPP_CROSS_NAME)$(exeext); \ rm -f $(DESTDIR)$(bindir)/$(CPP_CROSS_NAME)$(exeext); \
$(INSTALL_PROGRAM) -m 755 cpp$(exeext) $(bindir)/$(CPP_CROSS_NAME)$(exeext); \ $(INSTALL_PROGRAM) -m 755 cpp$(exeext) $(DESTDIR)$(bindir)/$(CPP_CROSS_NAME)$(exeext); \
if [ x$(cpp_install_dir) != x ]; then \ if [ x$(cpp_install_dir) != x ]; then \
rm -f $(prefix)/$(cpp_install_dir)/$(CPP_CROSS_NAME)$(exeext); \ rm -f $(DESTDIR)$(prefix)/$(cpp_install_dir)/$(CPP_CROSS_NAME)$(exeext); \
$(INSTALL_PROGRAM) -m 755 cpp$(exeext) $(prefix)/$(cpp_install_dir)/$(CPP_CROSS_NAME)$(exeext); \ $(INSTALL_PROGRAM) -m 755 cpp$(exeext) $(DESTDIR)$(prefix)/$(cpp_install_dir)/$(CPP_CROSS_NAME)$(exeext); \
else true; fi; \ else true; fi; \
else \ else \
rm -f $(bindir)/$(CPP_INSTALL_NAME)$(exeext); \ rm -f $(DESTDIR)$(bindir)/$(CPP_INSTALL_NAME)$(exeext); \
$(INSTALL_PROGRAM) -m 755 cpp$(exeext) $(bindir)/$(CPP_INSTALL_NAME)$(exeext); \ $(INSTALL_PROGRAM) -m 755 cpp$(exeext) $(DESTDIR)$(bindir)/$(CPP_INSTALL_NAME)$(exeext); \
if [ x$(cpp_install_dir) != x ]; then \ if [ x$(cpp_install_dir) != x ]; then \
rm -f $(prefix)/$(cpp_install_dir)/$(CPP_INSTALL_NAME)$(exeext); \ rm -f $(DESTDIR)$(prefix)/$(cpp_install_dir)/$(CPP_INSTALL_NAME)$(exeext); \
$(INSTALL_PROGRAM) -m 755 cpp$(exeext) $(prefix)/$(cpp_install_dir)/$(CPP_INSTALL_NAME)$(exeext); \ $(INSTALL_PROGRAM) -m 755 cpp$(exeext) $(DESTDIR)$(prefix)/$(cpp_install_dir)/$(CPP_INSTALL_NAME)$(exeext); \
else true; fi; \ else true; fi; \
fi fi
# Create the installation directories. # Create the installation directories.
# $(libdir)/gcc-lib/include isn't currently searched by cpp.
installdirs: installdirs:
-if [ -d $(prefix) ] ; then true ; else mkdir $(prefix) ; chmod a+rx $(prefix) ; fi $(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(libsubdir)
-if [ -d $(exec_prefix) ] ; then true ; else mkdir $(exec_prefix) ; chmod a+rx $(exec_prefix) ; fi $(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(bindir)
-if [ -d $(libdir) ] ; then true ; else mkdir $(libdir) ; chmod a+rx $(libdir) ; fi $(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(includedir)
-if [ -d $(libdir)/gcc-lib ] ; then true ; else mkdir $(libdir)/gcc-lib ; chmod a+rx $(libdir)/gcc-lib ; fi $(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(infodir)
# This dir isn't currently searched by cpp. $(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(slibdir)
# -if [ -d $(libdir)/gcc-lib/include ] ; then true ; else mkdir $(libdir)/gcc-lib/include ; chmod a+rx $(libdir)/gcc-lib/include ; fi $(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(man1dir)
-fdir= ; for dir in `echo $(libsubdir) | tr '/' ' '`; do \ $(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(man7dir)
fdir=$${fdir}/$${dir}; \
if [ -d $${fdir} ] ; then true ; else mkdir $${fdir}; chmod a+rx $${fdir}; fi ; \
done
-if [ -d $(bindir) ] ; then true ; else mkdir $(bindir) ; chmod a+rx $(bindir) ; fi
-if [ -d $(includedir) ] ; then true ; else mkdir $(includedir) ; chmod a+rx $(includedir) ; fi
-if [ -d $(infodir) ] ; then true ; else mkdir $(infodir) ; chmod a+rx $(infodir) ; fi
-if [ -d $(slibdir) ] ; then true ; else mkdir $(slibdir) ; chmod a+rx $(slibdir) ; fi
# 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 man1dir.
-parent=`echo $(man1dir)|sed -e 's@/[^/]*$$@@'`; \
if [ -d $$parent ] ; then true ; else mkdir $$parent ; chmod a+rx $$parent ; fi
-if [ -d $(man1dir) ] ; then true ; else mkdir $(man1dir) ; chmod a+rx $(man1dir) ; fi
-if [ -d $(man7dir) ] ; then true ; else mkdir $(man7dir) ; chmod a+rx $(man7dir) ; fi
# Install the compiler executables built during cross compilation. # Install the compiler executables built during cross compilation.
install-common: native $(EXTRA_PARTS) lang.install-common install-common: native $(EXTRA_PARTS) lang.install-common
for file in $(COMPILERS); do \ for file in $(COMPILERS); do \
if [ -f $$file ] ; then \ if [ -f $$file ] ; then \
rm -f $(libsubdir)/$$file; \ rm -f $(DESTDIR)$(libsubdir)/$$file; \
$(INSTALL_PROGRAM) $$file $(libsubdir)/$$file; \ $(INSTALL_PROGRAM) $$file $(DESTDIR)$(libsubdir)/$$file; \
else true; \ else true; \
fi; \ fi; \
done done
for file in $(EXTRA_PASSES) $(EXTRA_PROGRAMS) $(USE_COLLECT2) ..; do \ for file in $(EXTRA_PASSES) $(EXTRA_PROGRAMS) $(USE_COLLECT2) ..; do \
if [ x"$$file" != x.. ]; then \ if [ x"$$file" != x.. ]; then \
rm -f $(libsubdir)/$$file; \ rm -f $(DESTDIR)$(libsubdir)/$$file; \
$(INSTALL_PROGRAM) $$file $(libsubdir)/$$file; \ $(INSTALL_PROGRAM) $$file $(DESTDIR)$(libsubdir)/$$file; \
else true; fi; \ else true; fi; \
done done
for file in $(EXTRA_PARTS) ..; do \ for file in $(EXTRA_PARTS) ..; do \
if [ x"$$file" != x.. ]; then \ if [ x"$$file" != x.. ]; then \
rm -f $(libsubdir)/$$file; \ rm -f $(DESTDIR)$(libsubdir)/$$file; \
$(INSTALL_DATA) $$file $(libsubdir)/$$file; \ $(INSTALL_DATA) $$file $(DESTDIR)$(libsubdir)/$$file; \
chmod a-x $(libsubdir)/$$file; \ chmod a-x $(DESTDIR)$(libsubdir)/$$file; \
else true; fi; \ else true; fi; \
done done
# Don't mess with specs if it doesn't exist yet. # Don't mess with specs if it doesn't exist yet.
-if [ -f specs ] ; then \ -if [ -f specs ] ; then \
rm -f $(libsubdir)/specs; \ rm -f $(DESTDIR)$(libsubdir)/specs; \
$(INSTALL_DATA) specs $(libsubdir)/specs; \ $(INSTALL_DATA) specs $(DESTDIR)$(libsubdir)/specs; \
chmod a-x $(libsubdir)/specs; \ chmod a-x $(DESTDIR)$(libsubdir)/specs; \
fi fi
# Install protoize if it was compiled. # Install protoize if it was compiled.
-if [ -f protoize$(exeext) ]; \ -if [ -f protoize$(exeext) ]; \
then \ then \
if [ -f gcc-cross$(exeext) ] ; then \ if [ -f gcc-cross$(exeext) ] ; then \
rm -f $(bindir)/$(PROTOIZE_CROSS_NAME)$(exeext); \ rm -f $(DESTDIR)$(bindir)/$(PROTOIZE_CROSS_NAME)$(exeext); \
$(INSTALL_PROGRAM) protoize$(exeext) $(bindir)/$(PROTOIZE_CROSS_NAME)$(exeext); \ $(INSTALL_PROGRAM) protoize$(exeext) $(DESTDIR)$(bindir)/$(PROTOIZE_CROSS_NAME)$(exeext); \
rm -f $(bindir)/$(UNPROTOIZE_CROSS_NAME)$(exeext); \ rm -f $(DESTDIR)$(bindir)/$(UNPROTOIZE_CROSS_NAME)$(exeext); \
$(INSTALL_PROGRAM) unprotoize$(exeext) $(bindir)/$(UNPROTOIZE_CROSS_NAME)$(exeext); \ $(INSTALL_PROGRAM) unprotoize$(exeext) $(DESTDIR)$(bindir)/$(UNPROTOIZE_CROSS_NAME)$(exeext); \
else \ else \
rm -f $(bindir)/$(PROTOIZE_INSTALL_NAME)$(exeext); \ rm -f $(DESTDIR)$(bindir)/$(PROTOIZE_INSTALL_NAME)$(exeext); \
$(INSTALL_PROGRAM) protoize$(exeext) $(bindir)/$(PROTOIZE_INSTALL_NAME)$(exeext); \ $(INSTALL_PROGRAM) protoize$(exeext) $(DESTDIR)$(bindir)/$(PROTOIZE_INSTALL_NAME)$(exeext); \
rm -f $(bindir)/$(UNPROTOIZE_INSTALL_NAME)$(exeext); \ rm -f $(DESTDIR)$(bindir)/$(UNPROTOIZE_INSTALL_NAME)$(exeext); \
$(INSTALL_PROGRAM) unprotoize$(exeext) $(bindir)/$(UNPROTOIZE_INSTALL_NAME)$(exeext); \ $(INSTALL_PROGRAM) unprotoize$(exeext) $(DESTDIR)$(bindir)/$(UNPROTOIZE_INSTALL_NAME)$(exeext); \
fi ; \ fi ; \
rm -f $(libsubdir)/SYSCALLS.c.X; \ rm -f $(DESTDIR)$(libsubdir)/SYSCALLS.c.X; \
$(INSTALL_DATA) SYSCALLS.c.X $(libsubdir)/SYSCALLS.c.X; \ $(INSTALL_DATA) SYSCALLS.c.X $(DESTDIR)$(libsubdir)/SYSCALLS.c.X; \
chmod a-x $(libsubdir)/SYSCALLS.c.X; \ chmod a-x $(DESTDIR)$(libsubdir)/SYSCALLS.c.X; \
fi fi
# Install gcov if it was compiled. # Install gcov if it was compiled.
-if [ -f gcov$(exeext) ]; \ -if [ -f gcov$(exeext) ]; \
then \ then \
rm -f $(bindir)/gcov$(exeext); \ rm -f $(DESTDIR)$(bindir)/gcov$(exeext); \
$(INSTALL_PROGRAM) gcov$(exeext) $(bindir)/$(GCOV_INSTALL_NAME)$(exeext); \ $(INSTALL_PROGRAM) gcov$(exeext) $(DESTDIR)$(bindir)/$(GCOV_INSTALL_NAME)$(exeext); \
fi fi
$(INSTALL_SCRIPT) gccbug $(bindir)/$(GCCBUG_INSTALL_NAME) $(INSTALL_SCRIPT) gccbug $(DESTDIR)$(bindir)/$(GCCBUG_INSTALL_NAME)
# Install the driver program as $(target_alias)-gcc, # Install the driver program as $(target_alias)-gcc,
# $(target-alias)-gcc-$(version) # $(target-alias)-gcc-$(version)
# and also as either gcc (if native) or $(gcc_tooldir)/bin/gcc. # and also as either gcc (if native) or $(gcc_tooldir)/bin/gcc.
install-driver: installdirs xgcc$(exeext) install-driver: installdirs xgcc$(exeext)
-if [ -f gcc-cross$(exeext) ] ; then \ -if [ -f gcc-cross$(exeext) ] ; then \
rm -f $(bindir)/$(GCC_CROSS_NAME)$(exeext); \ rm -f $(DESTDIR)$(bindir)/$(GCC_CROSS_NAME)$(exeext); \
$(INSTALL_PROGRAM) gcc-cross$(exeext) $(bindir)/$(GCC_CROSS_NAME)$(exeext); \ $(INSTALL_PROGRAM) gcc-cross$(exeext) $(DESTDIR)$(bindir)/$(GCC_CROSS_NAME)$(exeext); \
rm -f $(bindir)/$(target_alias)-gcc-$(version); \ rm -f $(DESTDIR)$(bindir)/$(target_alias)-gcc-$(version); \
$(LN) $(bindir)/$(GCC_CROSS_NAME)$(exeext) $(bindir)/$(target_alias)-gcc-$(version) ; \ ( cd $(DESTDIR)$(bindir) && \
if [ -d $(gcc_tooldir)/bin/. ] ; then \ $(LN) $(GCC_CROSS_NAME)$(exeext) $(target_alias)-gcc-$(version) ); \
rm -f $(gcc_tooldir)/bin/gcc$(exeext); \ if [ -d $(DESTDIR)$(gcc_tooldir)/bin/. ] ; then \
$(INSTALL_PROGRAM) gcc-cross$(exeext) $(gcc_tooldir)/bin/gcc$(exeext); \ rm -f $(DESTDIR)$(gcc_tooldir)/bin/gcc$(exeext); \
$(INSTALL_PROGRAM) gcc-cross$(exeext) $(DESTDIR)$(gcc_tooldir)/bin/gcc$(exeext); \
else true; fi; \ else true; fi; \
else \ else \
rm -f $(bindir)/$(GCC_INSTALL_NAME)$(exeext); \ rm -f $(DESTDIR)$(bindir)/$(GCC_INSTALL_NAME)$(exeext); \
$(INSTALL_PROGRAM) xgcc$(exeext) $(bindir)/$(GCC_INSTALL_NAME)$(exeext); \ $(INSTALL_PROGRAM) xgcc$(exeext) $(DESTDIR)$(bindir)/$(GCC_INSTALL_NAME)$(exeext); \
rm -f $(bindir)/$(target_alias)-gcc-$(version); \ rm -f $(DESTDIR)$(bindir)/$(target_alias)-gcc-$(version); \
$(LN) $(bindir)/$(GCC_INSTALL_NAME)$(exeext) $(bindir)/$(target_alias)-gcc-$(version) ; \ ( cd $(DESTDIR)$(bindir) && \
rm -f $(bindir)/$(target_alias)-gcc-tmp$(exeext); \ $(LN) $(GCC_INSTALL_NAME)$(exeext) $(target_alias)-gcc-$(version) ); \
$(LN) $(bindir)/$(GCC_INSTALL_NAME)$(exeext) $(bindir)/$(target_alias)-gcc-tmp$(exeext); \ rm -f $(DESTDIR)$(bindir)/$(target_alias)-gcc-tmp$(exeext); \
mv $(bindir)/$(target_alias)-gcc-tmp$(exeext) $(bindir)/$(GCC_TARGET_INSTALL_NAME)$(exeext); \ ( cd $(DESTDIR)$(bindir) && \
$(LN) $(GCC_INSTALL_NAME)$(exeext) $(target_alias)-gcc-tmp$(exeext) && \
mv -f $(target_alias)-gcc-tmp$(exeext) $(GCC_TARGET_INSTALL_NAME)$(exeext) ); \
fi fi
# Install the info files. # Install the info files.
# $(INSTALL_DATA) might be a relative pathname, so we can't cd into srcdir # $(INSTALL_DATA) might be a relative pathname, so we can't cd into srcdir
# to do the install. # to do the install.
install-info: doc installdirs lang.install-info install-info: doc installdirs lang.install-info
-rm -f $(infodir)/cpp.info* $(infodir)/gcc.info* -rm -f $(DESTDIR)$(infodir)/cpp.info* $(DESTDIR)$(infodir)/gcc.info*
-rm -f $(infodir)/cppinternals.info* $(infodir)/gccint.info* -rm -f $(DESTDIR)$(infodir)/cppinternals.info* $(DESTDIR)$(infodir)/gccint.info*
if [ -f $(docdir)/gcc.info ]; then \ if [ -f $(docdir)/gcc.info ]; then \
for f in $(docdir)/cpp.info* $(docdir)/gcc.info* \ for f in $(docdir)/cpp.info* $(docdir)/gcc.info* \
$(docdir)/cppinternals.info* $(docdir)/gccint.info*; do \ $(docdir)/cppinternals.info* $(docdir)/gccint.info*; do \
realfile=`echo $$f | sed -e 's|.*/\([^/]*\)$$|\1|'`; \ realfile=`echo $$f | sed -e 's|.*/\([^/]*\)$$|\1|'`; \
$(INSTALL_DATA) $$f $(infodir)/$$realfile; \ $(INSTALL_DATA) $$f $(DESTDIR)$(infodir)/$$realfile; \
done; \ done; \
else true; fi else true; fi
-if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ -if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
if [ -f $(infodir)/dir ] ; then \ if [ -f $(DESTDIR)$(infodir)/dir ] ; then \
for f in cpp.info gcc.info gccint.info cppinternals.info; do \ for f in cpp.info gcc.info gccint.info cppinternals.info; do \
if [ -f $(infodir)/$$f ]; then \ if [ -f $(DESTDIR)$(infodir)/$$f ]; then \
install-info --dir-file=$(infodir)/dir $(infodir)/$$f; \ install-info --dir-file=$(DESTDIR)$(infodir)/dir $(DESTDIR)$(infodir)/$$f; \
else true; fi; \ else true; fi; \
done; \ done; \
else true; fi; \ else true; fi; \
else true; fi; else true; fi;
-chmod a-x $(infodir)/cpp.info* $(infodir)/gcc.info* -chmod a-x $(DESTDIR)$(infodir)/cpp.info* $(DESTDIR)$(infodir)/gcc.info*
-chmod a-x $(infodir)/cppinternals.info* $(infodir)/gccint.info* -chmod a-x $(DESTDIR)$(infodir)/cppinternals.info* $(DESTDIR)$(infodir)/gccint.info*
# Install the man pages. # Install the man pages.
install-man: installdirs $(GENERATED_MANPAGES) lang.install-man install-man: installdirs $(GENERATED_MANPAGES) lang.install-man
-if [ -f gcc-cross$(exeext) ] ; then \ -if [ -f gcc-cross$(exeext) ] ; then \
rm -f $(man1dir)/$(GCC_CROSS_NAME)$(man1ext); \ rm -f $(DESTDIR)$(man1dir)/$(GCC_CROSS_NAME)$(man1ext); \
$(INSTALL_DATA) $(docdir)/gcc.1 $(man1dir)/$(GCC_CROSS_NAME)$(man1ext); \ $(INSTALL_DATA) $(docdir)/gcc.1 $(DESTDIR)$(man1dir)/$(GCC_CROSS_NAME)$(man1ext); \
chmod a-x $(man1dir)/$(GCC_CROSS_NAME)$(man1ext); \ chmod a-x $(DESTDIR)$(man1dir)/$(GCC_CROSS_NAME)$(man1ext); \
else \ else \
rm -f $(man1dir)/$(GCC_INSTALL_NAME)$(man1ext); \ rm -f $(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext); \
$(INSTALL_DATA) $(docdir)/gcc.1 $(man1dir)/$(GCC_INSTALL_NAME)$(man1ext); \ $(INSTALL_DATA) $(docdir)/gcc.1 $(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext); \
chmod a-x $(man1dir)/$(GCC_INSTALL_NAME)$(man1ext); \ chmod a-x $(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext); \
fi fi
-rm -f $(man1dir)/cpp$(man1ext) -rm -f $(DESTDIR)$(man1dir)/cpp$(man1ext)
-$(INSTALL_DATA) $(docdir)/cpp.1 $(man1dir)/cpp$(man1ext) -$(INSTALL_DATA) $(docdir)/cpp.1 $(DESTDIR)$(man1dir)/cpp$(man1ext)
-chmod a-x $(man1dir)/cpp$(man1ext) -chmod a-x $(DESTDIR)$(man1dir)/cpp$(man1ext)
-rm -f $(man1dir)/gcov$(man1ext) -rm -f $(DESTDIR)$(man1dir)/gcov$(man1ext)
-$(INSTALL_DATA) $(docdir)/gcov.1 $(man1dir)/gcov$(man1ext) -$(INSTALL_DATA) $(docdir)/gcov.1 $(DESTDIR)$(man1dir)/gcov$(man1ext)
-chmod a-x $(man1dir)/gcov$(man1ext) -chmod a-x $(DESTDIR)$(man1dir)/gcov$(man1ext)
-rm -f $(man7dir)/fsf-funding$(man7ext) -rm -f $(DESTDIR)$(man7dir)/fsf-funding$(man7ext)
-$(INSTALL_DATA) $(docdir)/fsf-funding.7 $(man7dir)/fsf-funding$(man7ext) -$(INSTALL_DATA) $(docdir)/fsf-funding.7 $(DESTDIR)$(man7dir)/fsf-funding$(man7ext)
-chmod a-x $(man7dir)/fsf-funding$(man7ext) -chmod a-x $(DESTDIR)$(man7dir)/fsf-funding$(man7ext)
-rm -f $(man7dir)/gfdl$(man7ext) -rm -f $(DESTDIR)$(man7dir)/gfdl$(man7ext)
-$(INSTALL_DATA) $(docdir)/gfdl.7 $(man7dir)/gfdl$(man7ext) -$(INSTALL_DATA) $(docdir)/gfdl.7 $(DESTDIR)$(man7dir)/gfdl$(man7ext)
-chmod a-x $(man7dir)/gfdl$(man7ext) -chmod a-x $(DESTDIR)$(man7dir)/gfdl$(man7ext)
-rm -f $(man7dir)/gpl$(man7ext) -rm -f $(DESTDIR)$(man7dir)/gpl$(man7ext)
-$(INSTALL_DATA) $(docdir)/gpl.7 $(man7dir)/gpl$(man7ext) -$(INSTALL_DATA) $(docdir)/gpl.7 $(DESTDIR)$(man7dir)/gpl$(man7ext)
-chmod a-x $(man7dir)/gpl$(man7ext) -chmod a-x $(DESTDIR)$(man7dir)/gpl$(man7ext)
# Install the library. # Install the library.
install-libgcc: libgcc.mk libgcc.a installdirs install-libgcc: libgcc.mk libgcc.a installdirs
...@@ -2968,6 +2959,7 @@ install-libgcc: libgcc.mk libgcc.a installdirs ...@@ -2968,6 +2959,7 @@ install-libgcc: libgcc.mk libgcc.a installdirs
MAKEOVERRIDES= \ MAKEOVERRIDES= \
INSTALL_DATA="$(INSTALL_DATA)" \ INSTALL_DATA="$(INSTALL_DATA)" \
RANLIB_FOR_TARGET="$$r_f_t" \ RANLIB_FOR_TARGET="$$r_f_t" \
DESTDIR="$(DESTDIR)" \
libsubdir="$(libsubdir)" \ libsubdir="$(libsubdir)" \
slibdir="$(slibdir)" \ slibdir="$(slibdir)" \
-f libgcc.mk install -f libgcc.mk install
...@@ -2994,6 +2986,7 @@ install-multilib: stmp-multilib installdirs ...@@ -2994,6 +2986,7 @@ install-multilib: stmp-multilib installdirs
MAKEOVERRIDES= \ MAKEOVERRIDES= \
INSTALL_DATA="$(INSTALL_DATA)" \ INSTALL_DATA="$(INSTALL_DATA)" \
RANLIB_FOR_TARGET="$$r_f_t" \ RANLIB_FOR_TARGET="$$r_f_t" \
DESTDIR="$(DESTDIR)" \
libsubdir="$(libsubdir)" \ libsubdir="$(libsubdir)" \
slibdir="$(slibdir)" \ slibdir="$(slibdir)" \
-f libgcc.mk install -f libgcc.mk install
...@@ -3003,23 +2996,23 @@ install-headers: $(INSTALL_HEADERS_DIR) ...@@ -3003,23 +2996,23 @@ install-headers: $(INSTALL_HEADERS_DIR)
# Fix symlinks to absolute paths in the installed include directory to # Fix symlinks to absolute paths in the installed include directory to
# point to the installed directory, not the build directory. # point to the installed directory, not the build directory.
# Don't need to use LN_S here since we really do need ln -s and no substitutes. # Don't need to use LN_S here since we really do need ln -s and no substitutes.
-files=`cd $(libsubdir)/include; find . -type l -print 2>/dev/null`; \ -files=`cd $(DESTDIR)$(libsubdir)/include; find . -type l -print 2>/dev/null`; \
if [ $$? -eq 0 ]; then \ if [ $$? -eq 0 ]; then \
dir=`cd include; ${PWD}`; \ dir=`cd include; ${PWD}`; \
for i in $$files; do \ for i in $$files; do \
dest=`ls -ld $(libsubdir)/include/$$i | sed -n 's/.*-> //p'`; \ dest=`ls -ld $(DESTDIR)$(libsubdir)/include/$$i | sed -n 's/.*-> //p'`; \
if expr "$$dest" : "$$dir.*" > /dev/null; then \ if expr "$$dest" : "$$dir.*" > /dev/null; then \
rm -f $(libsubdir)/include/$$i; \ rm -f $(DESTDIR)$(libsubdir)/include/$$i; \
ln -s `echo $$i | sed "s|/[^/]*|/..|g" | sed 's|/..$$||'``echo "$$dest" | sed "s|$$dir||"` $(libsubdir)/include/$$i; \ ln -s `echo $$i | sed "s|/[^/]*|/..|g" | sed 's|/..$$||'``echo "$$dest" | sed "s|$$dir||"` $(DESTDIR)$(libsubdir)/include/$$i; \
fi; \ fi; \
done; \ done; \
fi fi
# Create or recreate the gcc private include file directory. # Create or recreate the gcc private include file directory.
install-include-dir: installdirs install-include-dir: installdirs
-rm -rf $(libsubdir)/include -rm -rf $(DESTDIR)$(libsubdir)/include
mkdir $(libsubdir)/include mkdir $(DESTDIR)$(libsubdir)/include
-chmod a+rx $(libsubdir)/include -chmod a+rx $(DESTDIR)$(libsubdir)/include
# Install the include directory using tar. # Install the include directory using tar.
install-headers-tar: stmp-int-hdrs $(STMP_FIXPROTO) install-include-dir install-headers-tar: stmp-int-hdrs $(STMP_FIXPROTO) install-include-dir
...@@ -3028,7 +3021,7 @@ install-headers-tar: stmp-int-hdrs $(STMP_FIXPROTO) install-include-dir ...@@ -3028,7 +3021,7 @@ install-headers-tar: stmp-int-hdrs $(STMP_FIXPROTO) install-include-dir
# found in CDPATH, corrupting the output. We could just redirect the # found in CDPATH, corrupting the output. We could just redirect the
# output of `cd', but some shells lose on redirection within `()'s # output of `cd', but some shells lose on redirection within `()'s
(cd `${PWD}`/include ; \ (cd `${PWD}`/include ; \
tar -cf - .; exit 0) | (cd $(libsubdir)/include; tar xpf - ) tar -cf - .; exit 0) | (cd $(DESTDIR)$(libsubdir)/include; tar xpf - )
# /bin/sh on some systems returns the status of the first tar, # /bin/sh on some systems returns the status of the first tar,
# and that can lose with GNU tar which always writes a full block. # and that can lose with GNU tar which always writes a full block.
# So use `exit 0' to ignore its exit status. # So use `exit 0' to ignore its exit status.
...@@ -3037,78 +3030,78 @@ install-headers-tar: stmp-int-hdrs $(STMP_FIXPROTO) install-include-dir ...@@ -3037,78 +3030,78 @@ install-headers-tar: stmp-int-hdrs $(STMP_FIXPROTO) install-include-dir
install-headers-cpio: stmp-int-hdrs $(STMP_FIXPROTO) install-include-dir install-headers-cpio: stmp-int-hdrs $(STMP_FIXPROTO) install-include-dir
# See discussion about the use of `pwd` above # See discussion about the use of `pwd` above
cd `${PWD}`/include ; \ cd `${PWD}`/include ; \
find . -print | cpio -pdum $(libsubdir)/include find . -print | cpio -pdum $(DESTDIR)$(libsubdir)/include
# Install the include directory using cp. # Install the include directory using cp.
install-headers-cp: stmp-int-hdrs $(STMP_FIXPROTO) install-include-dir install-headers-cp: stmp-int-hdrs $(STMP_FIXPROTO) install-include-dir
cp -p -r include $(libsubdir) cp -p -r include $(DESTDIR)$(libsubdir)
itoolsdir = $(libsubdir)/install-tools itoolsdir = $(libsubdir)/install-tools
# Don't install the headers. Instead, install appropriate scripts # Don't install the headers. Instead, install appropriate scripts
# and supporting files for fixincludes to be run later. # and supporting files for fixincludes to be run later.
install-mkheaders: stmp-int-hdrs $(STMP_FIXPROTO) install-include-dir \ install-mkheaders: stmp-int-hdrs $(STMP_FIXPROTO) install-include-dir \
mkheaders xlimits.h mkheaders xlimits.h
-rm -rf $(itoolsdir) -rm -rf $(DESTDIR)$(itoolsdir)
$(SHELL) $(srcdir)/mkinstalldirs $(itoolsdir)/include $(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$(itoolsdir)/include
for file in $(USER_H); do \ for file in $(USER_H); do \
realfile=`echo $$file | sed -e 's|.*/\([^/]*\)$$|\1|'`; \ realfile=`echo $$file | sed -e 's|.*/\([^/]*\)$$|\1|'`; \
$(INSTALL_DATA) $$file \ $(INSTALL_DATA) $$file \
$(itoolsdir)/include/$$realfile ; \ $(DESTDIR)$(itoolsdir)/include/$$realfile ; \
done done
$(INSTALL_DATA) xlimits.h $(itoolsdir)/include/limits.h $(INSTALL_DATA) xlimits.h $(DESTDIR)$(itoolsdir)/include/limits.h
if [ x$(STMP_FIXINC) != x ] ; then \ if [ x$(STMP_FIXINC) != x ] ; then \
$(INSTALL_DATA) $(srcdir)/README-fixinc \ $(INSTALL_DATA) $(srcdir)/README-fixinc \
$(itoolsdir)/include/README ; \ $(DESTDIR)$(itoolsdir)/include/README ; \
$(INSTALL_PROGRAM) fixinc.sh $(itoolsdir)/fixinc.sh ; \ $(INSTALL_PROGRAM) fixinc.sh $(DESTDIR)$(itoolsdir)/fixinc.sh ; \
$(INSTALL_PROGRAM) fixinc/fixincl $(itoolsdir)/fixincl ; \ $(INSTALL_PROGRAM) fixinc/fixincl $(DESTDIR)$(itoolsdir)/fixincl ; \
$(INSTALL_DATA) $(srcdir)/gsyslimits.h $(itoolsdir)/gsyslimits.h ; \ $(INSTALL_DATA) $(srcdir)/gsyslimits.h $(DESTDIR)$(itoolsdir)/gsyslimits.h ; \
else :; fi else :; fi
if [ x$(STMP_FIXPROTO) != x ] ; then \ if [ x$(STMP_FIXPROTO) != x ] ; then \
$(INSTALL_PROGRAM) $(srcdir)/mkinstalldirs \ $(INSTALL_PROGRAM) $(srcdir)/mkinstalldirs \
$(itoolsdir)/mkinstalldirs ; \ $(DESTDIR)$(itoolsdir)/mkinstalldirs ; \
$(INSTALL_PROGRAM) $(srcdir)/fixproto $(itoolsdir)/fixproto ; \ $(INSTALL_PROGRAM) $(srcdir)/fixproto $(DESTDIR)$(itoolsdir)/fixproto ; \
$(INSTALL_PROGRAM) fix-header$(build_exeext) \ $(INSTALL_PROGRAM) fix-header$(build_exeext) \
$(itoolsdir)/fix-header$(build_exeext) ; \ $(DESTDIR)$(itoolsdir)/fix-header$(build_exeext) ; \
else :; fi else :; fi
$(INSTALL_PROGRAM) mkheaders $(itoolsdir)/mkheaders $(INSTALL_PROGRAM) mkheaders $(DESTDIR)$(itoolsdir)/mkheaders
echo 'SYSTEM_HEADER_DIR="'"$(SYSTEM_HEADER_DIR)"'"' \ echo 'SYSTEM_HEADER_DIR="'"$(SYSTEM_HEADER_DIR)"'"' \
> $(itoolsdir)/mkheaders.conf > $(DESTDIR)$(itoolsdir)/mkheaders.conf
echo 'OTHER_FIXINCLUDES_DIRS="$(OTHER_FIXINCLUDES_DIRS)"' \ echo 'OTHER_FIXINCLUDES_DIRS="$(OTHER_FIXINCLUDES_DIRS)"' \
>> $(itoolsdir)/mkheaders.conf >> $(DESTDIR)$(itoolsdir)/mkheaders.conf
echo 'FIXPROTO_DEFINES="$(FIXPROTO_DEFINES)"' \ echo 'FIXPROTO_DEFINES="$(FIXPROTO_DEFINES)"' \
>> $(itoolsdir)/mkheaders.conf >> $(DESTDIR)$(itoolsdir)/mkheaders.conf
echo 'STMP_FIXPROTO="$(STMP_FIXPROTO)"' >> $(itoolsdir)/mkheaders.conf echo 'STMP_FIXPROTO="$(STMP_FIXPROTO)"' >> $(DESTDIR)$(itoolsdir)/mkheaders.conf
echo 'STMP_FIXINC="$(STMP_FIXINC)"' >> $(itoolsdir)/mkheaders.conf echo 'STMP_FIXINC="$(STMP_FIXINC)"' >> $(DESTDIR)$(itoolsdir)/mkheaders.conf
# Use this target to install the program `collect2' under the name `collect2'. # Use this target to install the program `collect2' under the name `collect2'.
install-collect2: collect2 installdirs install-collect2: collect2 installdirs
$(INSTALL_PROGRAM) collect2$(exeext) $(libsubdir)/collect2$(exeext) $(INSTALL_PROGRAM) collect2$(exeext) $(DESTDIR)$(libsubdir)/collect2$(exeext)
# Install the driver program as $(libsubdir)/gcc for collect2. # Install the driver program as $(libsubdir)/gcc for collect2.
$(INSTALL_PROGRAM) xgcc$(exeext) $(libsubdir)/gcc$(exeext) $(INSTALL_PROGRAM) xgcc$(exeext) $(DESTDIR)$(libsubdir)/gcc$(exeext)
# Cancel installation by deleting the installed files. # Cancel installation by deleting the installed files.
uninstall: intl.uninstall lang.uninstall uninstall: intl.uninstall lang.uninstall
-rm -rf $(libsubdir) -rm -rf $(DESTDIR)$(libsubdir)
-rm -rf $(bindir)/$(GCC_INSTALL_NAME)$(exeext) -rm -rf $(DESTDIR)$(bindir)/$(GCC_INSTALL_NAME)$(exeext)
-rm -rf $(bindir)/$(GCC_CROSS_NAME)$(exeext) -rm -rf $(DESTDIR)$(bindir)/$(GCC_CROSS_NAME)$(exeext)
-rm -f $(bindir)/$(CPP_INSTALL_NAME)$(exeext) -rm -f $(DESTDIR)$(bindir)/$(CPP_INSTALL_NAME)$(exeext)
-rm -f $(bindir)/$(CPP_CROSS_NAME)$(exeext) -rm -f $(DESTDIR)$(bindir)/$(CPP_CROSS_NAME)$(exeext)
-if [ x$(cpp_install_dir) != x ]; then \ -if [ x$(cpp_install_dir) != x ]; then \
rm -f $(prefix)/$(cpp_install_dir)/$(CPP_INSTALL_NAME)$(exeext); \ rm -f $(DESTDIR)$(prefix)/$(cpp_install_dir)/$(CPP_INSTALL_NAME)$(exeext); \
rm -f $(prefix)/$(cpp_install_dir)/$(CPP_CROSS_NAME)$(exeext); \ rm -f $(DESTDIR)$(prefix)/$(cpp_install_dir)/$(CPP_CROSS_NAME)$(exeext); \
else true; fi else true; fi
-rm -rf $(bindir)/$(PROTOIZE_INSTALL_NAME)$(exeext) -rm -rf $(DESTDIR)$(bindir)/$(PROTOIZE_INSTALL_NAME)$(exeext)
-rm -rf $(bindir)/$(PROTOIZE_CROSS_NAME)$(exeext) -rm -rf $(DESTDIR)$(bindir)/$(PROTOIZE_CROSS_NAME)$(exeext)
-rm -rf $(bindir)/$(UNPROTOIZE_INSTALL_NAME)$(exeext) -rm -rf $(DESTDIR)$(bindir)/$(UNPROTOIZE_INSTALL_NAME)$(exeext)
-rm -rf $(bindir)/$(UNPROTOIZE_CROSS_NAME)$(exeext) -rm -rf $(DESTDIR)$(bindir)/$(UNPROTOIZE_CROSS_NAME)$(exeext)
-rm -rf $(bindir)/$(GCOV_INSTALL_NAME)$(exeext) -rm -rf $(DESTDIR)$(bindir)/$(GCOV_INSTALL_NAME)$(exeext)
-rm -rf $(man1dir)/$(GCC_INSTALL_NAME)$(man1ext) -rm -rf $(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext)
-rm -rf $(man1dir)/$(GCC_CROSS_NAME)$(man1ext) -rm -rf $(DESTDIR)$(man1dir)/$(GCC_CROSS_NAME)$(man1ext)
-rm -rf $(man1dir)/cpp$(man1ext) -rm -rf $(DESTDIR)$(man1dir)/cpp$(man1ext)
-rm -rf $(man1dir)/protoize$(man1ext) -rm -rf $(DESTDIR)$(man1dir)/protoize$(man1ext)
-rm -rf $(man1dir)/unprotoize$(man1ext) -rm -rf $(DESTDIR)$(man1dir)/unprotoize$(man1ext)
-rm -f $(infodir)/cpp.info* $(infodir)/gcc.info* -rm -f $(DESTDIR)$(infodir)/cpp.info* $(DESTDIR)$(infodir)/gcc.info*
-rm -f $(infodir)/cppinternals.info* $(infodir)/gccint.info* -rm -f $(DESTDIR)$(infodir)/cppinternals.info* $(DESTDIR)$(infodir)/gccint.info*
# #
# These targets are for the dejagnu testsuites. The file site.exp # These targets are for the dejagnu testsuites. The file site.exp
# contains global variables that all the testsuites will use. # contains global variables that all the testsuites will use.
......
...@@ -17,6 +17,6 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \ ...@@ -17,6 +17,6 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
$(LN_S) $(SHLIB_NAME) $(SHLIB_SONAME) $(LN_S) $(SHLIB_NAME) $(SHLIB_SONAME)
# $(slibdir) double quoted to protect it from expansion while building # $(slibdir) double quoted to protect it from expansion while building
# libgcc.mk. We want this delayed until actual install time. # libgcc.mk. We want this delayed until actual install time.
SHLIB_INSTALL = $(INSTALL_DATA) $(SHLIB_NAME) $$(slibdir)/$(SHLIB_SONAME); \ SHLIB_INSTALL = $(INSTALL_DATA) $(SHLIB_NAME) $$(DESTDIR)$$(slibdir)/$(SHLIB_SONAME); \
rm -f $$(slibdir)/$(SHLIB_NAME); \ rm -f $$(DESTDIR)$$(slibdir)/$(SHLIB_NAME); \
$(LN_S) $(SHLIB_SONAME) $$(slibdir)/$(SHLIB_NAME) $(LN_S) $(SHLIB_SONAME) $$(DESTDIR)$$(slibdir)/$(SHLIB_NAME)
...@@ -62,10 +62,10 @@ stmp-multilib-arc: stmp-multilib ...@@ -62,10 +62,10 @@ stmp-multilib-arc: stmp-multilib
install-multilib-arc: install-multilib install-multilib-arc: install-multilib
for i in `$(GCC_FOR_TARGET) --print-multi-lib`; do \ for i in `$(GCC_FOR_TARGET) --print-multi-lib`; do \
dir=`echo $$i | sed -e 's/;.*$$//'`; \ dir=`echo $$i | sed -e 's/;.*$$//'`; \
rm -f $(libsubdir)/$${dir}/crtinit.o; \ rm -f $(DESTDIR)$(libsubdir)/$${dir}/crtinit.o; \
$(INSTALL_DATA) $${dir}/crtinit.o $(libsubdir)/$${dir}/crtinit.o; \ $(INSTALL_DATA) $${dir}/crtinit.o $(DESTDIR)$(libsubdir)/$${dir}/crtinit.o; \
chmod a-x $(libsubdir)/$${dir}/crtinit.o; \ chmod a-x $(DESTDIR)$(libsubdir)/$${dir}/crtinit.o; \
rm -f $(libsubdir)/$${dir}/crtfini.o; \ rm -f $(DESTDIR)$(libsubdir)/$${dir}/crtfini.o; \
$(INSTALL_DATA) $${dir}/crtfini.o $(libsubdir)/$${dir}/crtfini.o; \ $(INSTALL_DATA) $${dir}/crtfini.o $(DESTDIR)$(libsubdir)/$${dir}/crtfini.o; \
chmod a-x $(libsubdir)/$${dir}/crtfini.o; \ chmod a-x $(DESTDIR)$(libsubdir)/$${dir}/crtfini.o; \
done done
...@@ -16,9 +16,9 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \ ...@@ -16,9 +16,9 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
$(LN_S) $(SHLIB_NAME) $(SHLIB_SONAME) $(LN_S) $(SHLIB_NAME) $(SHLIB_SONAME)
# $(slibdir) double quoted to protect it from expansion while building # $(slibdir) double quoted to protect it from expansion while building
# libgcc.mk. We want this delayed until actual install time. # libgcc.mk. We want this delayed until actual install time.
SHLIB_INSTALL = $(INSTALL_DATA) $(SHLIB_NAME) $$(slibdir)/$(SHLIB_SONAME); \ SHLIB_INSTALL = $(INSTALL_DATA) $(SHLIB_NAME) $$(DESTDIR)$$(slibdir)/$(SHLIB_SONAME); \
rm -f $$(slibdir)/$(SHLIB_NAME); \ rm -f $$(DESTDIR)$$(slibdir)/$(SHLIB_NAME); \
$(LN_S) $(SHLIB_SONAME) $$(slibdir)/$(SHLIB_NAME) $(LN_S) $(SHLIB_SONAME) $$(DESTDIR)$$(slibdir)/$(SHLIB_NAME)
# Don't build enquire # Don't build enquire
ENQUIRE= ENQUIRE=
......
...@@ -40,9 +40,9 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \ ...@@ -40,9 +40,9 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
$(LN_S) @shlib_base_name@.so @shlib_base_name@.so.0 $(LN_S) @shlib_base_name@.so @shlib_base_name@.so.0
# $(slibdir) double quoted to protect it from expansion while building # $(slibdir) double quoted to protect it from expansion while building
# libgcc.mk. We want this delayed until actual install time. # libgcc.mk. We want this delayed until actual install time.
SHLIB_INSTALL = $(INSTALL_DATA) @shlib_base_name@.so $$(slibdir)/@shlib_base_name@.so.0; \ SHLIB_INSTALL = $(INSTALL_DATA) @shlib_base_name@.so $$(DESTDIR)$$(slibdir)/@shlib_base_name@.so.0; \
rm -f $$(slibdir)/@shlib_base_name@.so; \ rm -f $$(DESTDIR)$$(slibdir)/@shlib_base_name@.so; \
$(LN_S) @shlib_base_name@.so.0 $$(slibdir)/@shlib_base_name@.so; \ $(LN_S) @shlib_base_name@.so.0 $$(DESTDIR)$$(slibdir)/@shlib_base_name@.so; \
chmod +x $$(slibdir)/@shlib_base_name@.so chmod +x $$(DESTDIR)$$(slibdir)/@shlib_base_name@.so
SHLIB_MKMAP = $(srcdir)/mkmap-flat.awk SHLIB_MKMAP = $(srcdir)/mkmap-flat.awk
...@@ -20,11 +20,11 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \ ...@@ -20,11 +20,11 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
# $(slibdir) double quoted to protect it from expansion while building # $(slibdir) double quoted to protect it from expansion while building
# libgcc.mk. We want this delayed until actual install time. # libgcc.mk. We want this delayed until actual install time.
SHLIB_INSTALL = \ SHLIB_INSTALL = \
$$(SHELL) $$(srcdir)/mkinstalldirs $$(slibdir)$(SHLIB_SLIBDIR_QUAL); \ $$(SHELL) $$(srcdir)/mkinstalldirs $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL); \
$(INSTALL_DATA) $(SHLIB_NAME) \ $(INSTALL_DATA) $(SHLIB_NAME) \
$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SONAME); \ $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SONAME); \
rm -f $$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK); \ rm -f $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK); \
$(LN_S) $(SHLIB_SONAME) \ $(LN_S) $(SHLIB_SONAME) \
$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK) $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK)
SHLIB_MKMAP = $(srcdir)/mkmap-flat.awk SHLIB_MKMAP = $(srcdir)/mkmap-flat.awk
SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver
...@@ -13,7 +13,7 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \ ...@@ -13,7 +13,7 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
# $(slibdir) double quoted to protect it from expansion while building # $(slibdir) double quoted to protect it from expansion while building
# libgcc.mk. We want this delayed until actual install time. # libgcc.mk. We want this delayed until actual install time.
SHLIB_INSTALL = $(INSTALL_DATA) -m 555 $(SHLIB_NAME) \ SHLIB_INSTALL = $(INSTALL_DATA) -m 555 $(SHLIB_NAME) \
$$(slibdir)/$(SHLIB_SONAME); \ $$(DESTDIR)$$(slibdir)/$(SHLIB_SONAME); \
rm -f $$(slibdir)/$(SHLIB_NAME); \ rm -f $$(DESTDIR)$$(slibdir)/$(SHLIB_NAME); \
$(LN_S) $(SHLIB_SONAME) $$(slibdir)/$(SHLIB_NAME) $(LN_S) $(SHLIB_SONAME) $$(DESTDIR)$$(slibdir)/$(SHLIB_NAME)
...@@ -55,7 +55,7 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \ ...@@ -55,7 +55,7 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
rm -f @multilib_dir@/shr.o rm -f @multilib_dir@/shr.o
# $(slibdir) double quoted to protect it from expansion while building # $(slibdir) double quoted to protect it from expansion while building
# libgcc.mk. We want this delayed until actual install time. # libgcc.mk. We want this delayed until actual install time.
SHLIB_INSTALL = $(INSTALL_DATA) @shlib_base_name@.a $$(slibdir)/ SHLIB_INSTALL = $(INSTALL_DATA) @shlib_base_name@.a $$(DESTDIR)$$(slibdir)/
SHLIB_LIBS = -lc `case @shlib_base_name@ in *pthread*) echo -lpthread ;; esac` SHLIB_LIBS = -lc `case @shlib_base_name@ in *pthread*) echo -lpthread ;; esac`
SHLIB_MKMAP = $(srcdir)/mkmap-flat.awk SHLIB_MKMAP = $(srcdir)/mkmap-flat.awk
SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver
......
...@@ -36,7 +36,7 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \ ...@@ -36,7 +36,7 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
rm -f @multilib_dir@/shr.o rm -f @multilib_dir@/shr.o
# $(slibdir) double quoted to protect it from expansion while building # $(slibdir) double quoted to protect it from expansion while building
# libgcc.mk. We want this delayed until actual install time. # libgcc.mk. We want this delayed until actual install time.
SHLIB_INSTALL = $(INSTALL_DATA) @shlib_base_name@.a $$(slibdir)/ SHLIB_INSTALL = $(INSTALL_DATA) @shlib_base_name@.a $$(DESTDIR)$$(slibdir)/
SHLIB_LIBS = -lc `case @shlib_base_name@ in *pthread*) echo -lpthread ;; esac` SHLIB_LIBS = -lc `case @shlib_base_name@ in *pthread*) echo -lpthread ;; esac`
SHLIB_MKMAP = $(srcdir)/mkmap-flat.awk SHLIB_MKMAP = $(srcdir)/mkmap-flat.awk
SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver
......
...@@ -19,11 +19,11 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \ ...@@ -19,11 +19,11 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
# $(slibdir) double quoted to protect it from expansion while building # $(slibdir) double quoted to protect it from expansion while building
# libgcc.mk. We want this delayed until actual install time. # libgcc.mk. We want this delayed until actual install time.
SHLIB_INSTALL = \ SHLIB_INSTALL = \
$$(SHELL) $$(srcdir)/mkinstalldirs $$(slibdir)$(SHLIB_SLIBDIR_QUAL); \ $$(SHELL) $$(srcdir)/mkinstalldirs $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL); \
$(INSTALL_DATA) $(SHLIB_NAME) \ $(INSTALL_DATA) $(SHLIB_NAME) \
$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SONAME); \ $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SONAME); \
rm -f $$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK); \ rm -f $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK); \
$(LN_S) $(SHLIB_SONAME) \ $(LN_S) $(SHLIB_SONAME) \
$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK) $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK)
SHLIB_MKMAP = $(srcdir)/mkmap-symver.awk SHLIB_MKMAP = $(srcdir)/mkmap-symver.awk
SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver
...@@ -17,11 +17,11 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \ ...@@ -17,11 +17,11 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
# $(slibdir) double quoted to protect it from expansion while building # $(slibdir) double quoted to protect it from expansion while building
# libgcc.mk. We want this delayed until actual install time. # libgcc.mk. We want this delayed until actual install time.
SHLIB_INSTALL = \ SHLIB_INSTALL = \
$$(SHELL) $$(srcdir)/mkinstalldirs $$(slibdir)$(SHLIB_SLIBDIR_QUAL); \ $$(SHELL) $$(srcdir)/mkinstalldirs $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL); \
$(INSTALL_DATA) $(SHLIB_NAME) \ $(INSTALL_DATA) $(SHLIB_NAME) \
$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SONAME); \ $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SONAME); \
rm -f $$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK); \ rm -f $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK); \
$(LN_S) $(SHLIB_SONAME) \ $(LN_S) $(SHLIB_SONAME) \
$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK) $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK)
SHLIB_MKMAP = $(srcdir)/mkmap-symver.awk SHLIB_MKMAP = $(srcdir)/mkmap-symver.awk
SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver
...@@ -436,10 +436,10 @@ for ml in $MULTILIBS; do ...@@ -436,10 +436,10 @@ for ml in $MULTILIBS; do
dir=`echo ${ml} | sed -e 's/;.*$//' -e 's/=/$(EQ)/g'` dir=`echo ${ml} | sed -e 's/;.*$//' -e 's/=/$(EQ)/g'`
flags=`echo ${ml} | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`; flags=`echo ${ml} | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`;
if [ $dir != . ]; then if [ $dir != . ]; then
ldir='$(libsubdir)'/$dir ldir='$(DESTDIR)$(libsubdir)'/$dir
echo " if [ -d $ldir ]; then true; else mkdir $ldir; chmod a+rx $ldir; fi;" echo " if [ -d $ldir ]; then true; else mkdir $ldir; chmod a+rx $ldir; fi;"
else else
ldir='$(libsubdir)' ldir='$(DESTDIR)$(libsubdir)'
fi fi
echo ' $(INSTALL_DATA)' ${dir}/libgcc.a ${ldir}/ echo ' $(INSTALL_DATA)' ${dir}/libgcc.a ${ldir}/
echo ' $(RANLIB_FOR_TARGET)' ${ldir}/libgcc.a echo ' $(RANLIB_FOR_TARGET)' ${ldir}/libgcc.a
...@@ -495,10 +495,10 @@ for f in $EXTRA_MULTILIB_PARTS; do ...@@ -495,10 +495,10 @@ for f in $EXTRA_MULTILIB_PARTS; do
dir=`echo ${ml} | sed -e 's/;.*$//' -e 's/=/$(EQ)/g'` dir=`echo ${ml} | sed -e 's/;.*$//' -e 's/=/$(EQ)/g'`
if [ $dir != . ]; then if [ $dir != . ]; then
out=${dir}/$f out=${dir}/$f
ldir='$(libsubdir)'/$dir ldir='$(DESTDIR)$(libsubdir)'/$dir
else else
out=$f out=$f
ldir='$(libsubdir)' ldir='$(DESTDIR)$(libsubdir)'
fi fi
echo ' $(INSTALL_DATA)' $out $ldir/ echo ' $(INSTALL_DATA)' $out $ldir/
done done
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment