* java/lang/natSystem.cc (SystemClass): New define.

[pf3gnuchains/gcc-fork.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 29e72e7..795a7da 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,6 +35,7 @@ includedir=${prefix}/include
 oldincludedir=/usr/include
 infodir=${prefix}/info
 mandir=${prefix}/man
+gxx_include_dir=${includedir}/g++
 
 tooldir = $(exec_prefix)/$(target_alias)
 build_tooldir = $(exec_prefix)/$(target_alias)
@@ -187,7 +188,11 @@ RPATH_ENVVAR = LD_LIBRARY_PATH
 
 # configure.in sets SET_LIB_PATH to this if --enable-shared was used.
 REALLY_SET_LIB_PATH = \
-  $(RPATH_ENVVAR)=$$r/bfd:$$r/opcodes:$$$(RPATH_ENVVAR); \
+  if [ x"$$$(RPATH_ENVVAR)" != x ]; then \
+    $(RPATH_ENVVAR)=$$r/bfd:$$r/opcodes:$$$(RPATH_ENVVAR); \
+  else \
+    $(RPATH_ENVVAR)=$$r/bfd:$$r/opcodes; \
+  fi; \
   export $(RPATH_ENVVAR);
 
 ALL = all.normal
@@ -474,7 +479,7 @@ TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
 # The HOST_* variables are a special case, which are used for the gcc
 # cross-building scheme.
 EXTRA_GCC_FLAGS = \
-       'AR=$$(AR_FOR_TARGET)' \
+       'AR=$(AR)' \
        'AS=$(AS)' \
        'CC=$(CC)' \
        'CXX=$(CXX)' \
@@ -483,7 +488,7 @@ EXTRA_GCC_FLAGS = \
        'HOST_PREFIX=$(HOST_PREFIX)' \
        'HOST_PREFIX_1=$(HOST_PREFIX_1)' \
        'NM=$(NM)' \
-       'RANLIB=$$(RANLIB_FOR_TARGET)' \
+       'RANLIB=$(RANLIB)' \
        'WINDRES=$$(WINDRES_FOR_TARGET)' \
        "GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \
        "`echo 'LANGUAGES=$(LANGUAGES)' | sed -e s/.*=$$/XFOO=/`" \
@@ -1294,16 +1299,23 @@ $(CONFIGURE_TARGET_MODULES):
              libsrcdir="$$s/$${dir}"; \
            fi; \
            if [ -f $${libsrcdir}/configure ] ; then \
-             rm -f no-such-file; \
+             rm -f no-such-file skip-this-dir; \
              CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
                $(CONFIG_ARGUMENTS) $${srcdiroption} \
                --with-target-subdir="$(TARGET_SUBDIR)"; \
            else \
-             rm -f no-such-file; \
+             rm -f no-such-file skip-this-dir; \
              CONFIG_SITE=no-such-file $(SHELL) $$s/configure \
                $(CONFIG_ARGUMENTS) $${srcdiroption} \
                --with-target-subdir="$(TARGET_SUBDIR)"; \
            fi; \
+           if [ -f skip-this-dir ] ; then \
+             sh skip-this-dir; \
+             rm -f skip-this-dir; \
+             cd ..; rmdir $${dir} || true; \
+           else \
+             true; \
+           fi; \
          else \
            true; \
          fi; \
@@ -1662,7 +1674,7 @@ Makefile: Makefile.in configure.in $(host_makefile_frag) $(target_makefile_frag)
 # ChangeLog omitted because it may refer to files which are not in this
 # distribution (perhaps it would be better to include it anyway).
 DEVO_SUPPORT= README Makefile.in configure configure.in \
-       config.guess config.sub config move-if-change \
+       config.guess config.if config.sub config move-if-change \
        mpw-README mpw-build.in mpw-config.in mpw-configure mpw-install \
        COPYING COPYING.LIB install-sh config-ml.in symlink-tree \
        mkinstalldirs ltconfig ltmain.sh missing ylwrap