summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoretheisen <etheisen@cvs.openbsd.org>1996-08-12 07:47:12 +0000
committeretheisen <etheisen@cvs.openbsd.org>1996-08-12 07:47:12 +0000
commitf6b99ffa933bc67a2605243ebc3d19ca18f5b02d (patch)
tree8ac6ca374ee9d0a80dc4ba70c3a03a1ba0b2ee52
parenta237af18edd07fad456bf4e264a6e3900f51f992 (diff)
CFLAGS and LDFLAGS weren't being passed down to lower level makefiles.
Top level GNU Makefile really is drain-bamaged.
-rw-r--r--gnu/usr.bin/rcs/Makefile.in24
1 files changed, 22 insertions, 2 deletions
diff --git a/gnu/usr.bin/rcs/Makefile.in b/gnu/usr.bin/rcs/Makefile.in
index bf5a37274cf..cb244242c93 100644
--- a/gnu/usr.bin/rcs/Makefile.in
+++ b/gnu/usr.bin/rcs/Makefile.in
@@ -1,6 +1,6 @@
# Master makefile for RCS
-# $Id: Makefile.in,v 1.2 1996/08/12 04:26:12 millert Exp $
+# $Id: Makefile.in,v 1.3 1996/08/12 07:47:11 etheisen Exp $
# Copyright 1995 Paul Eggert
# Distributed under license by the Free Software Foundation, Inc.
@@ -32,6 +32,20 @@ VPATH = @srcdir@
@SET_MAKE@
SHELL = /bin/sh
+CFLAGS = @CFLAGS@
+LDFLAGS = @LDFLAGS@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+bindir = $(exec_prefix)/bin
+# Prefix for each installed program, normally empty or `g'.
+binprefix =
+libdir = $(prefix)/lib
+# Prefix for each installed man page, normally empty or `g'.
+manprefix =
+mandir = $(prefix)/man/man1
+manext = 1
+
# Documentation directories; special handling
INSTALL_MAN = man
# All other subdirs:
@@ -47,9 +61,15 @@ maintainer-clean ::
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
+MDEFINES = bindir='$(bindir)' mandir='$(mandir)' manext='$(manext)' \
+ prefix='$(prefix)' binprefix='$(binprefix)' \
+ manprefix='$(manprefix)' CFLAGS='$(CFLAGS)' \
+ CC='$(CC)' LDFLAGS='$(LDFLAGS)' \
+ INSTALL_MAN='$(INSTALL_MAN)'
+
$(standard_GNU_targets) installcheck installdebug ::
@for subdir in $(SUBDIRS); do \
- ( cd $$subdir && $(MAKE) $@ ) || exit 1; \
+ ( cd $$subdir && $(MAKE) $(MDEFINES) $@ ) || exit 1; \
done
dist :: $(srcdir)/configure