diff options
| author | Jeff Johnston <jjohnstn@redhat.com> | 2000-12-09 00:31:08 +0300 |
|---|---|---|
| committer | Jeff Johnston <jjohnstn@redhat.com> | 2000-12-09 00:31:08 +0300 |
| commit | a08c98bb808d1a1806c93be0b7934a19f48b5a0a (patch) | |
| tree | c122ad639d6c278eeaa30931cf5a2e510a12e599 | |
| parent | ff7c4faf873711c0bf37858ae8705d6e2e4fbe62 (diff) | |
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.
| -rw-r--r-- | newlib/ChangeLog | 9 | ||||
| -rw-r--r-- | newlib/Makefile.am | 6 | ||||
| -rw-r--r-- | newlib/Makefile.in | 11 |
3 files changed, 15 insertions, 11 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog index aa2526315..558d74d03 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -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> * libc/stdio/vfprintf.c: Minor modification to avoid requiring diff --git a/newlib/Makefile.am b/newlib/Makefile.am index a1ce30a8d..b78fd59c6 100644 --- a/newlib/Makefile.am +++ b/newlib/Makefile.am @@ -19,10 +19,6 @@ AM_MAKEFLAGS = \ "CFLAGS=$(CFLAGS)" \ "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \ - "INSTALL=$(INSTALL)" \ - "INSTALL_DATA=$(INSTALL_DATA)" \ - "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ - "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \ "LDFLAGS=$(LDFLAGS)" \ "LIBCFLAGS=$(LIBCFLAGS)" \ "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \ @@ -49,6 +45,8 @@ AM_MAKEFLAGS = \ "RANLIB=$(RANLIB)" \ "DESTDIR=$(DESTDIR)" +FLAGS_TO_PASS=$(AM_MAKEFLAGS) + if HAVE_DOC DOCDIR = doc endif diff --git a/newlib/Makefile.in b/newlib/Makefile.in index eb0fdaaf8..db16a1f8a 100644 --- a/newlib/Makefile.in +++ b/newlib/Makefile.in @@ -95,10 +95,6 @@ AM_MAKEFLAGS = \ "CFLAGS=$(CFLAGS)" \ "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \ - "INSTALL=$(INSTALL)" \ - "INSTALL_DATA=$(INSTALL_DATA)" \ - "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ - "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \ "LDFLAGS=$(LDFLAGS)" \ "LIBCFLAGS=$(LIBCFLAGS)" \ "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \ @@ -126,8 +122,9 @@ AM_MAKEFLAGS = \ "DESTDIR=$(DESTDIR)" -@HAVE_DOC_TRUE@DOCDIR = \ -@HAVE_DOC_TRUE@doc +FLAGS_TO_PASS = $(AM_MAKEFLAGS) + +@HAVE_DOC_TRUE@DOCDIR = @HAVE_DOC_TRUE@doc SUBDIRS = libc libm $(DOCDIR) . @@ -409,7 +406,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ if test -f $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ - cp -pr $$/$$file $(distdir)/$$file; \ + cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ |