Tweak for no-libio-install
Chip Salzenberg
chip@valinux.com
Sat Apr 1 00:00:00 GMT 2000
If src/Makefile decides that it doesn't need to install any libio
files, it dies with a shell syntax error. Here's a (semi-tested) patch.
2000-02-23 Chip Salzenberg <chip@valinux.com>
* src/Makefile.am (myinstallheaders): Cope with empty
$(libio_headers).
Index: Makefile.am
===================================================================
RCS file: /cvs/libstdc++/libstdc++/src/Makefile.am,v
retrieving revision 1.78
diff -u -2 -r1.78 Makefile.am
--- Makefile.am 2000/02/19 22:50:35 1.78
+++ Makefile.am 2000/02/23 08:31:55
@@ -49,5 +49,5 @@
$(AC_CXXFLAGS) $(OPTIMIZE_CXXFLAGS)
-CXXLINK = $(LIBTOOL) --mode=link $(CC) $(AM_CXXFLAGS) $(LDFLAGS) -o $@
+CXXLINK = $(LIBTOOL) --mode=link "$(CC)" $(AM_CXXFLAGS) $(LDFLAGS) -o $@
LIBIO_INCLUDES = @BUILD_LIBIO_INCLUDE@ -I$(top_srcdir)/libio
@@ -135,7 +135,6 @@
if GLIBCPP_NEED_LIBIO
libio_headers = \
- $(top_builddir)/libio/_G_config.h $(top_srcdir)/libio/libio.h
-else
-libio_headers =
+ $(top_builddir)/libio/_G_config.h \
+ $(top_srcdir)/libio/libio.h
endif
@@ -189,18 +188,22 @@
myinstallheaders: $(headers:%=$(myincludep)%)
- if test -z "$(MULTISUBDIR)"; then \
+ ifdef MULTISUBDIR
+ @true
+ else
for i in $(std_headers); do \
echo "$(INSTALL_DATA) $(top_srcdir)/std/$$i $(myincludep)"; \
$(INSTALL_DATA) $(top_srcdir)/std/$$i $(myincludep); \
- done; \
+ done
for i in $(generated_headers); do \
echo "$(INSTALL_DATA) $(top_builddir)/$$i $(myincludep)bits/"; \
$(INSTALL_DATA) $(top_builddir)/$$i $(myincludep)bits/; \
- done; \
+ done
+if GLIBCPP_NEED_LIBIO
for i in $(libio_headers); do \
echo "$(INSTALL_DATA) $$i $(myincludep)"; \
$(INSTALL_DATA) $$i $(myincludep); \
- done; \
- fi;
+ done
+endif
+ endif
$(headers:%=$(myincludep)%): $(myincludep)%: %
--
Chip Salzenberg - a.k.a. - <chip@valinux.com>
"I wanted to play hopscotch with the impenetrable mystery of existence,
but he stepped in a wormhole and had to go in early." // MST3K
More information about the Libstdc++
mailing list