[egcs-961016]: Use gxx_include_dir consistently
Manfred Hollstein
manfred@s-direktnet.de
Tue Oct 21 08:14:00 GMT 1997
Hi there,
since we can tell gcc where to look for g++ include files using the
`--with-gxx-include-dir' parameter when configuring, I believe the
library subsystems libio and libstdc++ should use the same
directory for installation.
The following patch provides this (if a user - like me - uses a
subdirectory below the fixed include files, it is necessary to install
gcc *before* the libraries, otherwise the g++ directory gets removed
by gcc's `install-include-dir' target; btw, this order was usual as
long as gcc and libg++ were separate packages):
Tue Oct 21 17:04:09 1997 Manfred Hollstein <manfred@s-direktnet.de>
* configure (gxx_include_dir): Emit definition for each Makefile.
(INSTALL_TARGET): Move install-gcc before INSTALL_MODULES.
* libio/Makefile.in (gxx_includedir): Renamed to gxx_include_dir so that
we can use what might have been given to gcc's configuration.
* libio/config.shared (gxx_includedir): Renamed and don't emit.
* libio/config/linux.mt (gxx_includedir): Renamed and don't define.
* libstdc++/Makefile.in (gxx_includedir): Renamed to gxx_include_dir so that
we can use what might have been given to gcc's configuration.
diff --context --recursive --show-c-function -x *.o -x *.info* -x *.html* -x *.elc -x *.dvi -x *.orig -x *~ -x version.el egcs-971016.orig/Makefile.in egcs-971016/Makefile.in
*** egcs-971016.orig/Makefile.in Mon Sep 29 08:37:07 1997
--- egcs-971016/Makefile.in Mon Oct 20 12:20:36 1997
*************** REALLY_SET_LIB_PATH = \
*** 175,184 ****
ALL = all.normal
INSTALL_TARGET = installdirs \
$(INSTALL_MODULES) \
$(INSTALL_TARGET_MODULES) \
$(INSTALL_X11_MODULES) \
- install-gcc \
$(INSTALL_DOSREL)
--- 175,184 ----
ALL = all.normal
INSTALL_TARGET = installdirs \
+ install-gcc \
$(INSTALL_MODULES) \
$(INSTALL_TARGET_MODULES) \
$(INSTALL_X11_MODULES) \
$(INSTALL_DOSREL)
diff --context --recursive --show-c-function -x *.o -x *.info* -x *.html* -x *.elc -x *.dvi -x *.orig -x *~ -x version.el egcs-971016.orig/configure egcs-971016/configure
*** egcs-971016.orig/configure Wed Oct 8 18:23:35 1997
--- egcs-971016/configure Mon Oct 20 12:20:37 1997
*************** EOF
*** 1171,1176 ****
--- 1171,1183 ----
echo site_makefile_frag = ${invsubdir}${site_makefile_frag} >>${Makefile}
fi
+ # provide a proper gxx_include_dir to all subdirs.
+ if test -z "${gxx_include_dir}"; then
+ echo gxx_include_dir = '${prefix}/include/g++' >> ${Makefile}
+ else
+ echo gxx_include_dir = ${gxx_include_dir} >> ${Makefile}
+ fi
+
# reset prefix, exec_prefix, srcdir, SUBDIRS, NONSUBDIRS,
# remove any form feeds.
if [ -z "${subdirs}" ]; then
diff --context --recursive --show-c-function -x *.o -x *.info* -x *.html* -x *.elc -x *.dvi -x *.orig -x *~ -x version.el egcs-971016.orig/libio/Makefile.in egcs-971016/libio/Makefile.in
*** egcs-971016.orig/libio/Makefile.in Sat Sep 27 06:06:53 1997
--- egcs-971016/libio/Makefile.in Mon Oct 20 12:20:41 1997
*************** install:
*** 113,121 ****
fi ; \
cd $(srcdir); \
for FILE in $(USER_INCLUDES); do if [ $$FILE != _G_config.h ]; then \
! rm -f $(gxx_includedir)/$$FILE ; \
! $(INSTALL_DATA) $$FILE $(gxx_includedir)/$$FILE ; \
! chmod a-x $(gxx_includedir)/$$FILE ; \
else true; fi; done ; \
else true; \
fi
--- 113,121 ----
fi ; \
cd $(srcdir); \
for FILE in $(USER_INCLUDES); do if [ $$FILE != _G_config.h ]; then \
! rm -f $(gxx_include_dir)/$$FILE ; \
! $(INSTALL_DATA) $$FILE $(gxx_include_dir)/$$FILE ; \
! chmod a-x $(gxx_include_dir)/$$FILE ; \
else true; fi; done ; \
else true; \
fi
diff --context --recursive --show-c-function -x *.o -x *.info* -x *.html* -x *.elc -x *.dvi -x *.orig -x *~ -x version.el egcs-971016.orig/libio/config/linux.mt egcs-971016/libio/config/linux.mt
*** egcs-971016.orig/libio/config/linux.mt Sat Sep 27 06:06:58 1997
--- egcs-971016/libio/config/linux.mt Mon Oct 20 12:20:41 1997
***************
*** 1,7 ****
# Use the libio which comes with the local libc.
# That is where we keep the g++ header files.
! gxx_includedir =$(prefix)/include/g++
# Comment this out to avoid including the stdio functions in libiostream.a:
# LIBIOSTREAM_OBJECTS = $(IO_OBJECTS) $(IOSTREAM_OBJECTS) $(STDIO_WRAP_OBJECTS) $(OSPRIM_OBJECTS)
--- 1,7 ----
# Use the libio which comes with the local libc.
# That is where we keep the g++ header files.
! # gxx_include_dir =$(prefix)/include/g++
# Comment this out to avoid including the stdio functions in libiostream.a:
# LIBIOSTREAM_OBJECTS = $(IO_OBJECTS) $(IOSTREAM_OBJECTS) $(STDIO_WRAP_OBJECTS) $(OSPRIM_OBJECTS)
diff --context --recursive --show-c-function -x *.o -x *.info* -x *.html* -x *.elc -x *.dvi -x *.orig -x *~ -x version.el egcs-971016.orig/libio/config.shared egcs-971016/libio/config.shared
*** egcs-971016.orig/libio/config.shared Sat Sep 27 06:06:54 1997
--- egcs-971016/libio/config.shared Mon Oct 20 12:20:41 1997
*************** echo 'man9dir = $(mandir)/man9'
*** 88,94 ****
echo 'infodir = $(prefix)/info'
echo 'includedir = $(prefix)/include'
! echo 'gxx_includedir = $(includedir)/g++'
echo 'docdir = $(datadir)/doc'
echo ''
echo 'SHELL = /bin/sh'
--- 88,94 ----
echo 'infodir = $(prefix)/info'
echo 'includedir = $(prefix)/include'
! # echo 'gxx_include_dir = $(includedir)/g++'
echo 'docdir = $(datadir)/doc'
echo ''
echo 'SHELL = /bin/sh'
diff --context --recursive --show-c-function -x *.o -x *.info* -x *.html* -x *.elc -x *.dvi -x *.orig -x *~ -x version.el egcs-971016.orig/libstdc++/Makefile.in egcs-971016/libstdc++/Makefile.in
*** egcs-971016.orig/libstdc++/Makefile.in Wed Aug 27 08:04:41 1997
--- egcs-971016/libstdc++/Makefile.in Mon Oct 20 12:20:42 1997
*************** install:
*** 249,263 ****
if [ -z "$(MULTISUBDIR)" ]; then \
cd $(srcdir); \
for FILE in $(HEADERS) *.h std/*.*; do \
! rm -f $(gxx_includedir)/$$FILE ; \
! $(INSTALL_DATA) $$FILE $(gxx_includedir)/$$FILE ; \
! chmod a-x $(gxx_includedir)/$$FILE ; \
done ; \
cd stl; \
for FILE in *.h; do \
! rm -f $(gxx_includedir)/$$FILE ; \
! $(INSTALL_DATA) $$FILE $(gxx_includedir)/$$FILE ; \
! chmod a-x $(gxx_includedir)/$$FILE ; \
done ; \
else true ; \
fi
--- 249,263 ----
if [ -z "$(MULTISUBDIR)" ]; then \
cd $(srcdir); \
for FILE in $(HEADERS) *.h std/*.*; do \
! rm -f $(gxx_include_dir)/$$FILE ; \
! $(INSTALL_DATA) $$FILE $(gxx_include_dir)/$$FILE ; \
! chmod a-x $(gxx_include_dir)/$$FILE ; \
done ; \
cd stl; \
for FILE in *.h; do \
! rm -f $(gxx_include_dir)/$$FILE ; \
! $(INSTALL_DATA) $$FILE $(gxx_include_dir)/$$FILE ; \
! chmod a-x $(gxx_include_dir)/$$FILE ; \
done ; \
else true ; \
fi
--
Manfred Hollstein If you have any questions about GNU SW:
Hindenburgstr. 13/1 < mailto:manfred@s-direktnet.de >
75446 Wiernsheim or take a look at
FRG < http://www.s-direktnet.de/HomePages/manfred/ >
Public PGP key from
< http://www.s-direktnet.de/HomePages/manfred/manfred.asc >
More information about the Gcc-bugs
mailing list