2000-10-06 David O'Brien <obrien@FreeBSD.org>

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

diff --git a/libio/Makefile.in b/libio/Makefile.in
index 75a1d00..1d4123b 100644 (file)
--- a/libio/Makefile.in
+++ b/libio/Makefile.in
@@ -22,6 +22,7 @@ VERSION = 2.8.0
 _G_CONFIG_H=_G_config.h
 tooldir = $(exec_prefix)/$(target)
 INSTALLDIR = $(libdir)
+gxx_include_dir=${includedir}/g++
 
 IO_OBJECTS = filedoalloc.o floatconv.o genops.o fileops.o \
   iovfprintf.o \
@@ -88,9 +89,13 @@ test: test.o libio.a
 tpipe: tpipe.o libio.a
        $(CC) $(CFLAGS) -o tpipe tpipe.o libio.a
 
-iostream.list: stamp-picdir $(_G_CONFIG_H) $(LIBIOSTREAM_DEP)
+iostream.list: $(_G_CONFIG_H) $(LIBIOSTREAM_DEP)
        @echo "$(LIBIOSTREAM_USE)"> iostream.list
 
+# The "pic" subdir must be created before we can put any object
+# files into it.
+$(LIBIOSTREAM_DEP) $(LIBIO_OBJECTS): stamp-picdir
+
 stmp-stdio:
        @rootme=`pwd`/ ; export rootme; cd stdio ; \
          $(MAKE) $(FLAGS_TO_PASS) stdio.list
@@ -108,8 +113,8 @@ install:
        if [ -z "$(MULTISUBDIR)" ]; then \
          if [ "$(_G_CONFIG_H)" != "" ]; then \
            if [ x$(enable_version_specific_runtime_libs) = xyes ]; then \
-             rm -f $(gxx_include_dir)/include/_G_config.h ; \
-             $(INSTALL_DATA) _G_config.h $(gxx_include_dir)/include/_G_config.h || exit 1; \
+             rm -f $(gxx_include_dir)/_G_config.h ; \
+             $(INSTALL_DATA) _G_config.h $(gxx_include_dir)/_G_config.h || exit 1; \
            else \
              rm -f $(tooldir)/include/_G_config.h ; \
              $(INSTALL_DATA) _G_config.h $(tooldir)/include/_G_config.h || exit 1; \