diff options
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/Makefile.in b/Makefile.in index 0c5606e5715..a44ea073d98 100644 --- a/Makefile.in +++ b/Makefile.in @@ -367,6 +367,7 @@ BASE_FLAGS_TO_PASS = \ "CXXFLAGS=$(CXXFLAGS)" \ "CXXFLAGS_FOR_TARGET=$(CXXFLAGS_FOR_TARGET)" \ "CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \ + "DESTDIR=$(DESTDIR)" \ "DLLTOOL_FOR_TARGET=$(DLLTOOL_FOR_TARGET)" \ "INSTALL=$(INSTALL)" \ "INSTALL_DATA=$(INSTALL_DATA)" \ @@ -761,7 +762,7 @@ ALL_TARGET_MODULES = \ all-target-zlib \ all-target-boehm-gc \ all-target-qthreads \ - all-target-rda + all-target-rda # This is a list of the configure targets for all of the modules which # are compiled using the target tools. @@ -781,7 +782,7 @@ CONFIGURE_TARGET_MODULES = \ configure-target-zlib \ configure-target-boehm-gc \ configure-target-qthreads \ - configure-target-rda + configure-target-rda # This is a list of the check targets for all of the modules which are # compiled using $(TARGET_FLAGS_TO_PASS). @@ -798,7 +799,7 @@ CHECK_TARGET_MODULES = \ check-target-zlib \ check-target-boehm-gc \ check-target-qthreads \ - check-target-rda + check-target-rda # This is a list of the install targets for all of the modules which are # compiled using $(TARGET_FLAGS_TO_PASS). @@ -812,11 +813,12 @@ INSTALL_TARGET_MODULES = \ install-target-libgloss \ install-target-libiberty \ install-target-gperf \ + install-target-libffi \ install-target-libjava \ install-target-zlib \ install-target-boehm-gc \ install-target-qthreads \ - install-target-rda + install-target-rda # This is a list of the targets for which we can do a clean-{target}. CLEAN_MODULES = \ @@ -879,7 +881,7 @@ CLEAN_MODULES = \ clean-uudecode \ clean-wdiff \ clean-zip \ - clean-zlib + clean-zlib # All of the target modules that can be cleaned CLEAN_TARGET_MODULES = \ @@ -897,7 +899,7 @@ CLEAN_TARGET_MODULES = \ clean-target-zlib \ clean-target-boehm-gc \ clean-target-qthreads \ - clean-target-rda + clean-target-rda # All of the x11 modules that can be cleaned CLEAN_X11_MODULES = \ @@ -997,7 +999,7 @@ do-info: all-texinfo install-info: do-install-info dir.info s=`cd $(srcdir); ${PWD}`; export s; \ if [ -f dir.info ] ; then \ - $(INSTALL_DATA) dir.info $(infodir)/dir.info ; \ + $(INSTALL_DATA) dir.info $(DESTDIR)$(infodir)/dir.info ; \ else true ; fi local-clean: @@ -1598,7 +1600,8 @@ check-gcc-c++: fi .PHONY: check-c++ -check-c++: check-target-libstdc++-v3 check-gcc-c++ +check-c++: + $(MAKE) check-target-libstdc++-v3 check-gcc-c++ NOTPARALLEL=parallel-ok .PHONY: install-gcc install-gcc: @@ -1784,7 +1787,7 @@ installdirs: mkinstalldirs dir.info: do-install-info if [ -f $(srcdir)/texinfo/gen-info-dir ] ; then \ - $(srcdir)/texinfo/gen-info-dir $(infodir) $(srcdir)/texinfo/dir.info-template > dir.info.new ; \ + $(srcdir)/texinfo/gen-info-dir $(DESTDIR)$(infodir) $(srcdir)/texinfo/dir.info-template > dir.info.new ; \ mv -f dir.info.new dir.info ; \ else true ; \ fi |