diff options
Diffstat (limited to 'Makefile.tpl')
| -rw-r--r-- | Makefile.tpl | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/Makefile.tpl b/Makefile.tpl index c34fcb552e4..05626e7450a 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -64,14 +64,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 @@ -92,7 +88,7 @@ tooldir = @tooldir@ build_tooldir = @build_tooldir@ # Directory in which the compiler finds executables, libraries, etc. -libsubdir = $(libdir)/gcc-lib/$(target_alias)/$(gcc_version) +libsubdir = $(libdir)/gcc/$(target_alias)/$(gcc_version) GDB_NLM_DEPS = # This is the name of the environment variable used for the path to @@ -462,12 +458,10 @@ EXTRA_GCC_FLAGS = \ 'AS=$(AS)' \ 'CC=$(CC)' \ 'CXX=$(CXX)' \ - 'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \ 'BUILD_PREFIX=$(BUILD_PREFIX)' \ 'BUILD_PREFIX_1=$(BUILD_PREFIX_1)' \ 'NM=$(NM)' \ 'RANLIB=$(RANLIB)' \ - 'WINDRES=$$(WINDRES_FOR_TARGET)' \ "GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \ "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ "`echo 'LANGUAGES=$(LANGUAGES)' | sed -e s/.*=$$/XFOO=/`" \ @@ -476,7 +470,6 @@ EXTRA_GCC_FLAGS = \ "`echo 'LIBGCC2_CFLAGS=$(LIBGCC2_CFLAGS)' | sed -e s/.*=$$/XFOO=/`" \ "`echo 'LIBGCC2_DEBUG_CFLAGS=$(LIBGCC2_DEBUG_CFLAGS)' | sed -e s/.*=$$/XFOO=/`" \ "`echo 'LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)' | sed -e s/.*=$$/XFOO=/`" \ - "`echo 'ENQUIRE=$(ENQUIRE)' | sed -e s/.*=$$/XFOO=/`" \ "`echo 'STAGE1_CFLAGS=$(STAGE1_CFLAGS)' | sed -e s/.*=$$/XFOO=/`" \ "`echo 'BOOT_CFLAGS=$(BOOT_CFLAGS)' | sed -e s/.*=$$/XFOO=/`" @@ -669,8 +662,7 @@ clean-target-libgcc: # Check target. .PHONY: check do-check -check: - $(MAKE) do-check +check: do-check # Only include modules actually being configured and built. do-check: maybe-check-gcc [+ @@ -783,8 +775,7 @@ TAGS: do-TAGS maybe-configure-build-[+module+]: configure-build-[+module+]: @test ! -f $(BUILD_SUBDIR)/[+module+]/Makefile || exit 0; \ - [ -d $(BUILD_SUBDIR)/[+module+] ] || \ - mkdir $(BUILD_SUBDIR)/[+module+];\ + $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/[+module+] ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ AR="$(AR_FOR_BUILD)"; export AR; \ @@ -954,15 +945,13 @@ maybe-configure-target-[+module+]: # There's only one multilib.out. Cleverer subdirs shouldn't need it copied. $(TARGET_SUBDIR)/[+module+]/multilib.out: multilib.out - @[ -d $(TARGET_SUBDIR)/[+module+] ] || \ - mkdir $(TARGET_SUBDIR)/[+module+]; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/[+module+] ; \ rm -f $(TARGET_SUBDIR)/[+module+]/Makefile || : ; \ cp multilib.out $(TARGET_SUBDIR)/[+module+]/multilib.out configure-target-[+module+]: $(TARGET_SUBDIR)/[+module+]/multilib.out @test ! -f $(TARGET_SUBDIR)/[+module+]/Makefile || exit 0; \ - [ -d $(TARGET_SUBDIR)/[+module+] ] || \ - mkdir $(TARGET_SUBDIR)/[+module+];\ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/[+module+] ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(SET_LIB_PATH) \ @@ -1236,8 +1225,7 @@ check-gcc-c++: fi .PHONY: check-c++ -check-c++: - $(MAKE) check-target-libstdc++-v3 check-gcc-c++ +check-c++: check-target-libstdc++-v3 check-gcc-c++ .PHONY: install-gcc maybe-install-gcc maybe-install-gcc: @@ -1346,7 +1334,7 @@ all-flex: maybe-all-libiberty maybe-all-bison maybe-all-byacc all-gzip: maybe-all-libiberty all-hello: maybe-all-libiberty all-m4: maybe-all-libiberty maybe-all-texinfo -all-make: maybe-all-libiberty +all-make: maybe-all-libiberty maybe-all-intl all-patch: maybe-all-libiberty all-prms: maybe-all-libiberty all-recode: maybe-all-libiberty |