[PATCH] newlib: build+install info pages by default
Mike Frysinger <[email protected]>
| Newsgroups | gmane.comp.lib.newlib |
|---|---|
| Message-ID | <[email protected]> |
The no-installinfo option was added as part of the migration off of
the cygnus option in order to maintain compatibility. However, GNU
standards say we should be building+shipping info pages by default,
so let's enable these by default.
Our release tarballs should be including these, so end devs shouldn't
have to build them themselves in practice. People building from git
will have to, but that also aligns with other GNU projects, including
the various toolchain ones.
---
newlib/Makefile.in | 13 ++++++-------
newlib/acinclude.m4 | 2 +-
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/newlib/Makefile.in b/newlib/Makefile.in
index cb7b693279fa..f9b0adae7cd7 100644
--- a/newlib/Makefile.in
+++ b/newlib/Makefile.in
@@ -973,8 +973,8 @@ am__uninstall_files_from_dir = { \
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
-am__installdirs = "$(DESTDIR)$(toollibdir)" "$(DESTDIR)$(cctdir)" \
- "$(DESTDIR)$(toollibdir)"
+am__installdirs = "$(DESTDIR)$(toollibdir)" "$(DESTDIR)$(infodir)" \
+ "$(DESTDIR)$(cctdir)" "$(DESTDIR)$(toollibdir)"
LIBRARIES = $(toollib_LIBRARIES)
ARFLAGS = cru
AM_V_AR = $(am__v_AR_@AM_V@)
@@ -3676,7 +3676,6 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
-runstatedir = @runstatedir@
sbindir = @sbindir@
shared_machine_dir = @shared_machine_dir@
sharedstatedir = @sharedstatedir@
@@ -46273,10 +46272,10 @@ check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
$(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU
check: check-am
-all-am: Makefile $(LIBRARIES) $(DATA) newlib.h _newlib_version.h \
- all-local
+all-am: Makefile $(INFO_DEPS) $(LIBRARIES) $(DATA) newlib.h \
+ _newlib_version.h all-local
installdirs:
- for dir in "$(DESTDIR)$(toollibdir)" "$(DESTDIR)$(cctdir)" "$(DESTDIR)$(toollibdir)"; do \
+ for dir in "$(DESTDIR)$(toollibdir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(cctdir)" "$(DESTDIR)$(toollibdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -46572,7 +46571,7 @@ info: info-am
info-am: $(INFO_DEPS)
-install-data-am: install-cctDATA install-data-local \
+install-data-am: install-cctDATA install-data-local install-info-am \
install-toollibDATA install-toollibLIBRARIES
install-dvi: install-dvi-am
diff --git a/newlib/acinclude.m4 b/newlib/acinclude.m4
index 9e4834987716..ad9384049b97 100644
--- a/newlib/acinclude.m4
+++ b/newlib/acinclude.m4
@@ -114,7 +114,7 @@ AC_SUBST(abs_newlib_basedir)
AC_CANONICAL_HOST
-AM_INIT_AUTOMAKE([foreign no-installinfo no-dist no-define subdir-objects 1.15.1])
+AM_INIT_AUTOMAKE([foreign no-dist no-define subdir-objects 1.15.1])
AM_MAINTAINER_MODE
AM_SILENT_RULES(yes)
--
2.37.3