diff options
| author | Nathanael Nerode <neroden@gcc.gnu.org> | 2003-07-13 20:47:31 +0000 |
|---|---|---|
| committer | Nathanael Nerode <neroden@gcc.gnu.org> | 2003-07-13 20:47:31 +0000 |
| commit | 775956d09438a0ab87727ed153f5cd132cef2773 (patch) | |
| tree | bf418af6f88e3c805062a396f60a5cd5b92cb569 /Makefile.in | |
| parent | 7eaab492be613f9f1aa93ae983d4d436331645a9 (diff) | |
| download | gcc-775956d09438a0ab87727ed153f5cd132cef2773.zip gcc-775956d09438a0ab87727ed153f5cd132cef2773.tar.gz gcc-775956d09438a0ab87727ed153f5cd132cef2773.tar.bz2 | |
re PR bootstrap/11273 (make install fails in libobjc directory)
PR bootstrap/11273
PR bootstrap/11408
* Makefile.tpl: Set INSTALL and friends using autoconf. Remove
unused INSTALL_PROGRAM_ARGS.
* configure.in: Use AC_PROG_INSTALL.
* Makefile.in: Regenerate.
* configure: Regenerate.
From-SVN: r69304
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 81 |
1 files changed, 73 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in index 136a4f8..0b3c8b8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -61,14 +61,10 @@ man7dir = $(mandir)/man7 man8dir = $(mandir)/man8 man9dir = $(mandir)/man9 -# INSTALL_PROGRAM_ARGS is changed by configure.in to use -x for a -# cygwin host. -INSTALL_PROGRAM_ARGS = - -INSTALL = $(SHELL) $$s/install-sh -c -INSTALL_PROGRAM = $(INSTALL) $(INSTALL_PROGRAM_ARGS) -INSTALL_SCRIPT = $(INSTALL) -INSTALL_DATA = $(INSTALL) -m 644 +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_DATA = @INSTALL_DATA@ # ------------------------------------------------- # Miscellaneous non-standard autoconf-set variables @@ -17610,6 +17606,75 @@ TAGS: do-TAGS # Modules which run on the build machine # -------------------------------------- +.PHONY: configure-build-fixincludes maybe-configure-build-fixincludes +maybe-configure-build-fixincludes: +configure-build-fixincludes: + @test ! -f $(BUILD_SUBDIR)/fixincludes/Makefile || exit 0; \ + [ -d $(BUILD_SUBDIR)/fixincludes ] || \ + mkdir $(BUILD_SUBDIR)/fixincludes;\ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + AR="$(AR_FOR_BUILD)"; export AR; \ + AS="$(AS_FOR_BUILD)"; export AS; \ + CC="$(CC_FOR_BUILD)"; export CC; \ + CFLAGS="$(CFLAGS_FOR_BUILD)"; export CFLAGS; \ + CXX="$(CXX_FOR_BUILD)"; export CXX; \ + CXXFLAGS="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS; \ + GCJ="$(GCJ_FOR_BUILD)"; export GCJ; \ + DLLTOOL="$(DLLTOOL_FOR_BUILD)"; export DLLTOOL; \ + LD="$(LD_FOR_BUILD)"; export LD; \ + LDFLAGS="$(LDFLAGS_FOR_BUILD)"; export LDFLAGS; \ + NM="$(NM_FOR_BUILD)"; export NM; \ + RANLIB="$(RANLIB_FOR_BUILD)"; export RANLIB; \ + WINDRES="$(WINDRES_FOR_BUILD)"; export WINDRES; \ + echo Configuring in $(BUILD_SUBDIR)/fixincludes; \ + cd "$(BUILD_SUBDIR)/fixincludes" || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) \ + topdir=$(srcdir) ;; \ + *) \ + case "$(BUILD_SUBDIR)" in \ + .) topdir="../$(srcdir)" ;; \ + *) topdir="../../$(srcdir)" ;; \ + esac ;; \ + esac; \ + if [ "$(srcdir)" = "." ] ; then \ + if [ "$(BUILD_SUBDIR)" != "." ] ; then \ + if $(SHELL) $$s/symlink-tree $${topdir}/fixincludes "no-such-file" ; then \ + if [ -f Makefile ]; then \ + if $(MAKE) distclean; then \ + true; \ + else \ + exit 1; \ + fi; \ + else \ + true; \ + fi; \ + else \ + exit 1; \ + fi; \ + else \ + true; \ + fi; \ + srcdiroption="--srcdir=."; \ + libsrcdir="."; \ + else \ + srcdiroption="--srcdir=$${topdir}/fixincludes"; \ + libsrcdir="$$s/fixincludes"; \ + fi; \ + rm -f no-such-file || : ; \ + CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ + $(BUILD_CONFIGARGS) $${srcdiroption} \ + --with-build-subdir="$(BUILD_SUBDIR)" \ + || exit 1 + +.PHONY: all-build-fixincludes maybe-all-build-fixincludes +maybe-all-build-fixincludes: +all-build-fixincludes: configure-build-fixincludes + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + (cd $(BUILD_SUBDIR)/fixincludes && $(MAKE) all) + .PHONY: configure-build-libiberty maybe-configure-build-libiberty maybe-configure-build-libiberty: configure-build-libiberty: |