summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnu/usr.bin/gcc/Makefile.bsd-wrapper5
-rw-r--r--gnu/usr.bin/gcc/gcc/Makefile.in38
2 files changed, 22 insertions, 21 deletions
diff --git a/gnu/usr.bin/gcc/Makefile.bsd-wrapper b/gnu/usr.bin/gcc/Makefile.bsd-wrapper
index 7cbed48e528..3282d9eced0 100644
--- a/gnu/usr.bin/gcc/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/gcc/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.39 2003/11/29 14:24:49 espie Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.40 2003/11/29 14:55:05 espie Exp $
#MAN= cccp.1 gcc.1 gcc-local.1 protoize.1 gcov.1
MAN= gcc.1 cpp.1 gcov.1
@@ -42,7 +42,8 @@ MAKE_FLAGS+= HOST_CFLAGS="${VAXHOST_CFLAGS}"
GXX_INCDIR= /usr/include/g++
CLEANFILES= .gdbinit */.gdbinit *.info* \
c-parse.c c-parse.h c-parse.y cexp.c cp/parse.c cp/parse.h \
- f/*.info* objc-parse.c objc-parse.y target_path \
+ f/*.info* objc/objc-parse.c objc/objc-parse.y target_path \
+ print-rtl1.c gengtype-lex.c gengtype-yacc.c gengtype-yacc.h \
genrtl.c genrtl.h fixinc.sh fixinc/Makefile \
po/Makefile po/Makefile.in po/POTFILES
diff --git a/gnu/usr.bin/gcc/gcc/Makefile.in b/gnu/usr.bin/gcc/gcc/Makefile.in
index 00967450825..5326486d16b 100644
--- a/gnu/usr.bin/gcc/gcc/Makefile.in
+++ b/gnu/usr.bin/gcc/gcc/Makefile.in
@@ -2476,7 +2476,7 @@ stmp-fixproto: fixhdr.ready fixproto stmp-int-hdrs
docdir = $(srcdir)/doc
doc: $(BUILD_INFO) $(GENERATED_MANPAGES) gccbug
-info: $(docdir)/cpp.info $(docdir)/gcc.info $(docdir)/gccint.info $(docdir)/gccinstall.info lang.info $(docdir)/cppinternals.info
+info: cpp.info gcc.info gccint.info gccinstall.info lang.info cppinternals.info
TEXI_CPP_FILES = $(docdir)/cpp.texi $(docdir)/include/fdl.texi \
$(docdir)/cppenv.texi $(docdir)/cppopts.texi
@@ -2510,21 +2510,21 @@ TEXI_GCCINSTALL_FILES = $(docdir)/install.texi $(docdir)/install-old.texi \
TEXI_CPPINT_FILES = $(docdir)/cppinternals.texi
-$(docdir)/cpp.info: $(TEXI_CPP_FILES)
- cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -I doc -I doc/include -o doc/cpp.info doc/cpp.texi
+cpp.info: $(TEXI_CPP_FILES)
+ $(MAKEINFO) $(MAKEINFOFLAGS) -I $(srcdir)/doc -I $(srcdir)/doc/include -o cpp.info $(srcdir)/doc/cpp.texi
-$(docdir)/gcc.info: $(TEXI_GCC_FILES)
- cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -I doc -I doc/include -o doc/gcc.info doc/gcc.texi
+gcc.info: $(TEXI_GCC_FILES)
+ $(MAKEINFO) $(MAKEINFOFLAGS) -I $(srcdir)/doc -I $(srcdir)/doc/include -o gcc.info $(srcdir)/doc/gcc.texi
-$(docdir)/gccint.info: $(TEXI_GCCINT_FILES)
- cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -I doc -I doc/include -o doc/gccint.info doc/gccint.texi
+gccint.info: $(TEXI_GCCINT_FILES)
+ $(MAKEINFO) $(MAKEINFOFLAGS) -I $(srcdir)/doc -I $(srcdir)/doc/include -o gccint.info $(srcdir)/doc/gccint.texi
-$(docdir)/gccinstall.info: $(TEXI_GCCINSTALL_FILES)
- cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -I doc -I doc/include -o doc/gccinstall.info doc/install.texi
+gccinstall.info: $(TEXI_GCCINSTALL_FILES)
+ $(MAKEINFO) $(MAKEINFOFLAGS) -I $(srcdir)/doc -I $(srcdir)/doc/include -o gccinstall.info $(srcdir)/doc/install.texi
-$(docdir)/cppinternals.info: $(TEXI_CPPINT_FILES)
- cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -I doc -I doc/include -o doc/cppinternals.info \
- doc/cppinternals.texi
+cppinternals.info: $(TEXI_CPPINT_FILES)
+ $(MAKEINFO) $(MAKEINFOFLAGS) -I $(srcdir)/doc -I $(srcdir)/doc/include -o cppinternals.info \
+ $(srcdir)/doc/cppinternals.texi
dvi: gcc.dvi gccint.dvi gccinstall.dvi cpp.dvi lang.dvi cppinternals.dvi
@@ -2738,10 +2738,10 @@ maintainer-clean:
-rm -f c-parse.y c-parse.c c-parse.output TAGS
-rm -f cpp.??s cpp.*aux
-rm -f gcc.??s gcc.*aux
- -rm -f $(docdir)/cpp.info* $(docdir)/gcc.info* $(docdir)/gccint.info*
- -rm -f $(docdir)/cppinternals.info*
- -rm -f $(docdir)/gcov.1 $(docdir)/cpp.1 $(docdir)/gcc.1
- -rm -f $(docdir)/fsf-funding.7 $(docdir)/gfdl.7 $(docdir)/gpl.7
+ -rm -f cpp.info* gcc.info* gccint.info*
+ -rm -f cppinternals.info*
+ -rm -f gcov.1 cpp.1 gcc.1
+ -rm -f fsf-funding.7 gfdl.7 gpl.7
#
# Entry points `install' and `uninstall'.
# Also use `install-collect2' to install collect2 when the config files don't.
@@ -2868,9 +2868,9 @@ install-driver: installdirs xgcc$(exeext)
install-info: doc installdirs lang.install-info
-rm -f $(DESTDIR)$(infodir)/cpp.info* $(DESTDIR)$(infodir)/gcc.info*
-rm -f $(DESTDIR)$(infodir)/cppinternals.info* $(DESTDIR)$(infodir)/gccint.info*
- if [ -f $(docdir)/gcc.info ]; then \
- for f in $(docdir)/cpp.info* $(docdir)/gcc.info* \
- $(docdir)/cppinternals.info* $(docdir)/gccint.info*; do \
+ if [ -f gcc.info ]; then \
+ for f in cpp.info* gcc.info* \
+ cppinternals.info* gccint.info*; do \
realfile=`echo $$f | sed -e 's|.*/\([^/]*\)$$|\1|'`; \
$(INSTALL_DATA) $$f $(DESTDIR)$(infodir)/$$realfile; \
done; \