Fix "make install-headers" again

It must not recursively descent into source directories, and must not depend on a cross-compiler already being available
freemint · Jun 4, 2024 · a5b1e0c · a5b1e0c
1 parent 5919d04
commit a5b1e0c
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 14 deletions.
diff --git a/Makefile b/Makefile
@@ -133,7 +133,7 @@ install-lib: all install-lib-recursive
 
 install-include: all install-include-recursive
 
-install-headers: install-include-recursive
+install-headers: install-headers-recursive
 
 install-man: all install-man-recursive
 
@@ -249,6 +249,18 @@ uninstall-include-recursive uninstall-man-recursive:
 	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
 	done && test -z "$$fail"
 
+install-headers-recursive:
+	if test "${CROSS}" = yes -a "$(DESTDIR)${prefix}" = "/usr"; then \
+	   echo "attempting to install on host; aborting" >&2; \
+           exit 1; \
+	fi; \
+	list='include'; \
+	for subdir in $$list; do \
+	  target=`echo $@ | sed s/-recursive//`; \
+	  echo "Making $$target in $$subdir"; \
+	  $(MAKE) -C $$subdir $$target || exit 1; \
+	done
+
 dist-recursive bindist-recursive:
 	@set fnord $(MAKEFLAGS); amf=$$2; \
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

diff --git a/include/Makefile b/include/Makefile
@@ -78,7 +78,7 @@ syscall-list.h: $(csrcdir)/syscalls.list $(csrcdir)/gensys
 
 includefiles = $(filter %.h, $(MISCFILES)) stab.def syscall-list.h
 
-install-include: remove-stale
+install-include install-headers: remove-stale
 	$(mkinstalldirs) $(DESTDIR)$(includedir)
 	@list='$(includefiles)'; for p in $$list; do \
   	  if test -f $$p; then \

diff --git a/include/arpa/Makefile b/include/arpa/Makefile
@@ -30,7 +30,7 @@ include $(top_srcdir)/rules
 
 includefiles = $(filter %.h, $(MISCFILES))
 
-install-include: 
+install-include install-headers:
 	$(mkinstalldirs) $(DESTDIR)$(includedir)/$(subdir)
 	@list='$(includefiles)'; for p in $$list; do \
   	  if test -f $$p; then \

diff --git a/include/bits/Makefile b/include/bits/Makefile
@@ -32,7 +32,7 @@ include $(top_srcdir)/rules
 
 includefiles = $(filter %.h, $(MISCFILES))
 
-install-include: 
+install-include install-headers:
 	$(mkinstalldirs) $(DESTDIR)$(includedir)/$(subdir)
 	@list='$(includefiles)'; for p in $$list; do \
   	  if test -f $$p; then \

diff --git a/include/bits/types/Makefile b/include/bits/types/Makefile
@@ -30,7 +30,7 @@ include $(top_srcdir)/rules
 
 includefiles = $(filter %.h, $(MISCFILES))
 
-install-include: 
+install-include install-headers:
 	$(mkinstalldirs) $(DESTDIR)$(includedir)/$(subdir)
 	@list='$(includefiles)'; for p in $$list; do \
   	  if test -f $$p; then \

diff --git a/include/mint/Makefile b/include/mint/Makefile
@@ -32,7 +32,7 @@ include $(top_srcdir)/rules
 
 includefiles = $(filter %.h, $(MISCFILES))
 
-install-include: 
+install-include install-headers:
 	$(mkinstalldirs) $(DESTDIR)$(includedir)/$(subdir)
 	@list='$(includefiles)'; for p in $$list; do \
   	  if test -f $$p; then \

diff --git a/include/mint/arch/Makefile b/include/mint/arch/Makefile
@@ -30,7 +30,7 @@ include $(top_srcdir)/rules
 
 includefiles = $(filter %.h, $(MISCFILES))
 
-install-include: 
+install-include install-headers:
 	$(mkinstalldirs) $(DESTDIR)$(includedir)/$(subdir)
 	@list='$(includefiles)'; for p in $$list; do \
   	  if test -f $$p; then \

diff --git a/include/net/Makefile b/include/net/Makefile
@@ -30,7 +30,7 @@ include $(top_srcdir)/rules
 
 includefiles = $(filter %.h, $(MISCFILES))
 
-install-include: 
+install-include install-headers:
 	$(mkinstalldirs) $(DESTDIR)$(includedir)/$(subdir)
 	@list='$(includefiles)'; for p in $$list; do \
   	  if test -f $$p; then \

diff --git a/include/netinet/Makefile b/include/netinet/Makefile
@@ -30,7 +30,7 @@ include $(top_srcdir)/rules
 
 includefiles = $(filter %.h, $(MISCFILES))
 
-install-include: 
+install-include install-headers:
 	$(mkinstalldirs) $(DESTDIR)$(includedir)/$(subdir)
 	@list='$(includefiles)'; for p in $$list; do \
   	  if test -f $$p; then \

diff --git a/include/nfs/Makefile b/include/nfs/Makefile
@@ -31,7 +31,7 @@ include $(top_srcdir)/rules
 includefiles = $(filter %.h, $(MISCFILES))
 includefiles += $(filter %.x, $(MISCFILES))
 
-install-include: 
+install-include install-headers:
 	$(mkinstalldirs) $(DESTDIR)$(includedir)/$(subdir)
 	@list='$(includefiles)'; for p in $$list; do \
   	  if test -f $$p; then \

diff --git a/include/protocols/Makefile b/include/protocols/Makefile
@@ -30,7 +30,7 @@ include $(top_srcdir)/rules
 
 includefiles = $(filter %.h, $(MISCFILES))
 
-install-include: 
+install-include install-headers:
 	$(mkinstalldirs) $(DESTDIR)$(includedir)/$(subdir)
 	@list='$(includefiles)'; for p in $$list; do \
   	  if test -f $$p; then \

diff --git a/include/rpc/Makefile b/include/rpc/Makefile
@@ -30,7 +30,7 @@ include $(top_srcdir)/rules
 
 includefiles = $(filter %.h, $(MISCFILES))
 
-install-include: 
+install-include install-headers:
 	$(mkinstalldirs) $(DESTDIR)$(includedir)/$(subdir)
 	@list='$(includefiles)'; for p in $$list; do \
   	  if test -f $$p; then \

diff --git a/include/rpcsvc/Makefile b/include/rpcsvc/Makefile
@@ -31,7 +31,7 @@ include $(top_srcdir)/rules
 includefiles = $(filter %.h, $(MISCFILES))
 includefiles += $(filter %.x, $(MISCFILES))
 
-install-include: 
+install-include install-headers:
 	$(mkinstalldirs) $(DESTDIR)$(includedir)/$(subdir)
 	@list='$(includefiles)'; for p in $$list; do \
   	  if test -f $$p; then \

diff --git a/include/sys/Makefile b/include/sys/Makefile
@@ -30,7 +30,7 @@ include $(top_srcdir)/rules
 
 includefiles = $(filter %.h, $(MISCFILES))
 
-install-include: 
+install-include install-headers:
 	$(mkinstalldirs) $(DESTDIR)$(includedir)/$(subdir)
 	@list='$(includefiles)'; for p in $$list; do \
   	  if test -f $$p; then \