* symfile.c (symfile_bfd_open): Change ifdef from __WIN32__ to

[deliverable/binutils-gdb.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index e199c352ec58acb135b9adb18669a5413faeffab..adaff10041708db09caf9986cdf2d3ee5c28e51b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -28,7 +28,7 @@ tooldir = $(exec_prefix)/$(target)
 
 program_transform_name =
 
-datadir = $(prefix)/lib
+datadir = $(prefix)/share
 mandir = $(prefix)/man
 man1dir = $(mandir)/man1
 man2dir = $(mandir)/man2
@@ -41,7 +41,6 @@ man8dir = $(mandir)/man8
 man9dir = $(mandir)/man9
 infodir = $(prefix)/info
 includedir = $(prefix)/include
-docdir = $(datadir)/doc
 GDB_NLM_DEPS = 
 
 SHELL = /bin/sh
@@ -142,7 +141,8 @@ OTHERS =
 TARGET_CONFIGDIRS = libiberty libgloss newlib libio librx libstdc++ libg++ winsup
 
 # Target libraries are put under this directory:
-TARGET_SUBDIR = . # Changed by configure to $(target_alias) if cross.
+# Changed by configure to $(target_alias) if cross.
+TARGET_SUBDIR = .
 
 # This is set by the configure script to the arguments passed to configure.
 CONFIG_ARGUMENTS = 
@@ -412,6 +412,7 @@ GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS)
 ALL_MODULES = \
        all-apache \
        all-autoconf \
+       all-bash \
        all-bfd \
        all-binutils \
        all-byacc \
@@ -459,8 +460,6 @@ ALL_MODULES = \
        all-uudecode \
        all-wdiff 
 
-# This is a list of the check targets for all of the modules which are
-# compiled using $(FLAGS_TO_PASS).
 # This is a list of the check targets for all of the modules which are
 # compiled using $(FLAGS_TO_PASS).
 #
@@ -474,6 +473,7 @@ NATIVE_CHECK_MODULES = \
 CROSS_CHECK_MODULES = \
        check-apache \
        check-autoconf \
+       check-bash \
        check-bfd \
        check-binutils \
        check-cvs \
@@ -523,6 +523,7 @@ CHECK_MODULES=$(NATIVE_CHECK_MODULES) $(CROSS_CHECK_MODULES)
 INSTALL_MODULES = \
        install-apache \
        install-autoconf \
+       install-bash \
        install-bfd \
        install-binutils \
        install-byacc \
@@ -655,6 +656,7 @@ INSTALL_TARGET_MODULES = \
 CLEAN_MODULES = \
        clean-apache \
        clean-autoconf \
+       clean-bash \
        clean-bfd \
        clean-binutils \
        clean-byacc \
@@ -855,6 +857,7 @@ $(CLEAN_MODULES) $(CLEAN_X11_MODULES) clean-gcc:
 .PHONY: $(CLEAN_TARGET_MODULES)
 $(CLEAN_TARGET_MODULES):
        @dir=`echo $@ | sed -e 's/clean-target-//'`; \
+       rm -f $(TARGET_SUBDIR)/$${dir}/multilib.out $(TARGET_SUBDIR)/$${dir}/tmpmulti.out; \
        if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \
          r=`pwd`; export r; \
          srcroot=`cd $(srcdir); pwd`; export srcroot; \
@@ -1009,6 +1012,22 @@ $(INSTALL_MODULES): install-dirs
 # target tools.
 .PHONY: $(CONFIGURE_TARGET_MODULES)
 $(CONFIGURE_TARGET_MODULES):
+       @dir=`echo $@ | sed -e 's/configure-target-//'`; \
+       if [ -d $(TARGET_SUBDIR)/$${dir} ]; then \
+         r=`pwd`; export r; \
+         $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/$${dir}/tmpmulti.out; \
+         if [ -f $(TARGET_SUBDIR)/$${dir}/multilib.out ]; then \
+           if cmp $(TARGET_SUBDIR)/$${dir}/multilib.out $(TARGET_SUBDIR)/$${dir}/tmpmulti.out > /dev/null; then \
+             rm -f $(TARGET_SUBDIR)/$${dir}/tmpmulti.out; \
+           else \
+             echo "Multilibs changed for $${dir}, reconfiguring"; \
+             rm -f $(TARGET_SUBDIR)/$${dir}/multilib.out $(TARGET_SUBDIR)/$${dir}/Makefile; \
+             mv $(TARGET_SUBDIR)/$${dir}/tmpmulti.out $(TARGET_SUBDIR)/$${dir}/multilib.out; \
+           fi; \
+         else \
+           mv $(TARGET_SUBDIR)/$${dir}/tmpmulti.out $(TARGET_SUBDIR)/$${dir}/multilib.out; \
+         fi; \
+       fi; exit 0      # break command into two pieces
        @dir=`echo $@ | sed -e 's/configure-target-//'`; \
        if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \
          true; \
@@ -1235,6 +1254,7 @@ install-dosrel-fake:
 # This is a list of inter-dependencies among modules.
 all-apache:
 all-autoconf: all-m4
+all-bash:
 all-bfd:
 all-binutils: all-libiberty all-opcodes all-bfd all-flex all-byacc
 all-byacc:
@@ -1453,11 +1473,15 @@ taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) \
          ln -s ../../../texinfo/util/tex3patch proto-toplev/texinfo/util ; \
        else true; fi
        chmod og=u `find . -print`
-       (VER=`sed <$(TOOL)/Makefile.in -n 's/^VERSION *= *//p'`; \
-               echo "==> Making $(TOOL)-$$VER.tar.gz"; \
-               rm -f $(TOOL)-$$VER; ln -s proto-toplev $(TOOL)-$$VER; \
-               tar cfh - $(TOOL)-$$VER \
-               | $(GZIPPROG) -v -9 >$(TOOL)-$$VER.tar.gz )
+       $(MAKE) -f Makefile.in do-tar-gz TOOL=$(TOOL) \
+               VER=`sed <$(TOOL)/Makefile.in -n 's/^VERSION *= *//p'`
+
+do-tar-gz:
+       echo "==> Making $(TOOL)-$(VER).tar.gz"
+       -rm -f $(TOOL)-$(VER)
+       ln -s proto-toplev $(TOOL)-$(VER)
+       tar cfh $(TOOL)-$(VER).tar $(TOOL)-$(VER)
+       $(GZIPPROG) -v -9 $(TOOL)-$(VER).tar
 
 TEXINFO_SUPPORT= texinfo/texinfo.tex texinfo/gpl.texinfo texinfo/lgpl.texinfo
 DIST_SUPPORT= $(DEVO_SUPPORT) $(TEXINFO_SUPPORT)