2000-12-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* Makefile.am: $(INSTALL), $(INSTALL_DATA), and $(INSTALL_PROGRAM)
        can be a relative path to $(top_srcdir)/install.sh so ensure the
        autoconf detected settings are properly passed recursively.
        Similarly, add AM_MAKEFLAGS to FLAGS_TO_PASS so they also get passed
        properly to subdirectories.
        * Makefile.in: Regenerated.
This commit is contained in:
Jeff Johnston 2000-12-08 21:31:08 +00:00
parent ff7c4faf87
commit a08c98bb80
3 changed files with 15 additions and 11 deletions

View File

@ -1,3 +1,12 @@
2000-12-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: $(INSTALL), $(INSTALL_DATA), and $(INSTALL_PROGRAM)
can be a relative path to $(top_srcdir)/install.sh so ensure the
autoconf detected settings are properly passed recursively.
Similarly, add AM_MAKEFLAGS to FLAGS_TO_PASS so they also get passed
properly to subdirectories.
* Makefile.in: Regenerated.
2000-12-07 Jay Kulpinski <jskulpin@eng01.gdds.com> 2000-12-07 Jay Kulpinski <jskulpin@eng01.gdds.com>
* libc/stdio/vfprintf.c: Minor modification to avoid requiring * libc/stdio/vfprintf.c: Minor modification to avoid requiring

View File

@ -19,10 +19,6 @@ AM_MAKEFLAGS = \
"CFLAGS=$(CFLAGS)" \ "CFLAGS=$(CFLAGS)" \
"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
"CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \ "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
"INSTALL=$(INSTALL)" \
"INSTALL_DATA=$(INSTALL_DATA)" \
"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
"INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
"LDFLAGS=$(LDFLAGS)" \ "LDFLAGS=$(LDFLAGS)" \
"LIBCFLAGS=$(LIBCFLAGS)" \ "LIBCFLAGS=$(LIBCFLAGS)" \
"LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \ "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
@ -49,6 +45,8 @@ AM_MAKEFLAGS = \
"RANLIB=$(RANLIB)" \ "RANLIB=$(RANLIB)" \
"DESTDIR=$(DESTDIR)" "DESTDIR=$(DESTDIR)"
FLAGS_TO_PASS=$(AM_MAKEFLAGS)
if HAVE_DOC if HAVE_DOC
DOCDIR = doc DOCDIR = doc
endif endif

View File

@ -95,10 +95,6 @@ AM_MAKEFLAGS = \
"CFLAGS=$(CFLAGS)" \ "CFLAGS=$(CFLAGS)" \
"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
"CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \ "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
"INSTALL=$(INSTALL)" \
"INSTALL_DATA=$(INSTALL_DATA)" \
"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
"INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
"LDFLAGS=$(LDFLAGS)" \ "LDFLAGS=$(LDFLAGS)" \
"LIBCFLAGS=$(LIBCFLAGS)" \ "LIBCFLAGS=$(LIBCFLAGS)" \
"LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \ "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
@ -126,8 +122,9 @@ AM_MAKEFLAGS = \
"DESTDIR=$(DESTDIR)" "DESTDIR=$(DESTDIR)"
@HAVE_DOC_TRUE@DOCDIR = \ FLAGS_TO_PASS = $(AM_MAKEFLAGS)
@HAVE_DOC_TRUE@doc
@HAVE_DOC_TRUE@DOCDIR = @HAVE_DOC_TRUE@doc
SUBDIRS = libc libm $(DOCDIR) . SUBDIRS = libc libm $(DOCDIR) .
@ -409,7 +406,7 @@ distdir: $(DISTFILES)
@for file in $(DISTFILES); do \ @for file in $(DISTFILES); do \
if test -f $$file; then d=.; else d=$(srcdir); fi; \ if test -f $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \ if test -d $$d/$$file; then \
cp -pr $$/$$file $(distdir)/$$file; \ cp -pr $$d/$$file $(distdir)/$$file; \
else \ else \
test -f $(distdir)/$$file \ test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \