install-lib does not need to be run in source directories

th-otto · th-otto · commit efb57cd04c3c · 2024-06-04T12:57:06.000+02:00
diff --git a/Makefile b/Makefile
@@ -231,8 +231,8 @@ bindistdir: $(BINDISTFILES)
 	done
 
 all-recursive clean-recursive distclean-recursive bakclean-recursive \
-install-recursive uninstall-recursive install-lib-recursive \
-install-include-recursive install-man-recursive uninstall-lib-recursive \
+install-recursive uninstall-recursive \
+install-include-recursive install-man-recursive \
 uninstall-include-recursive uninstall-man-recursive:
 	@set fnord $(MAKEFLAGS); amf=$$2; \
 	echo $@ | grep -q install; \
@@ -249,6 +249,19 @@ uninstall-include-recursive uninstall-man-recursive:
 	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
 	done && test -z "$$fail"
 
+install-lib-recursive uninstall-lib-recursive:
+	echo $@ | grep -q install; \
+	if test $$? = 0 -a "${CROSS}" = yes -a "$(DESTDIR)${prefix}" = "/usr"; then \
+	   echo "attempting to install on host; aborting" >&2; \
+           exit 1; \
+	fi; \
+	list='$(LIBDIRS)'; \
+	for subdir in $$list; do \
+	  target=`echo $@ | sed s/-recursive//`; \
+	  echo "Making $$target in $$subdir"; \
+	  $(MAKE) -C $$target $$subdir || exit 1; \
+	done
+
 install-headers-recursive:
 	if test "${CROSS}" = yes -a "$(DESTDIR)${prefix}" = "/usr"; then \
 	   echo "attempting to install on host; aborting" >&2; \
diff --git a/argp/Makefile b/argp/Makefile
@@ -26,7 +26,6 @@ default: all
 
 all-here:
 
-dont_install_libs = yes
 include $(top_srcdir)/rules $(top_srcdir)/phony
 
 # FIXME: stratcliff still missing because of missing mman.h.
diff --git a/conf/Makefile b/conf/Makefile
@@ -26,7 +26,6 @@ default: all
 
 all-here:
 
-dont_install_libs = yes
 include $(top_srcdir)/rules $(top_srcdir)/phony
 
 install-include:
diff --git a/crypt/Makefile b/crypt/Makefile
@@ -28,7 +28,6 @@ default: all
 
 all-here:
 
-dont_install_libs = yes
 include $(top_srcdir)/rules $(top_srcdir)/phony
 
 TESTS = cert md5_1 md5_2 ufc
diff --git a/crypt/examples/Makefile b/crypt/examples/Makefile
@@ -22,7 +22,6 @@ default: all
 
 all-here:
 
-dont_install_libs = yes
 include $(top_srcdir)/rules $(top_srcdir)/phony
 
 install-include:
diff --git a/dirent/Makefile b/dirent/Makefile
@@ -26,7 +26,6 @@ default: all
 
 all-here:
 
-dont_install_libs = yes
 include $(top_srcdir)/rules $(top_srcdir)/phony
 
 TESTS = list opendir seekdir
diff --git a/gmp/Makefile b/gmp/Makefile
@@ -26,7 +26,6 @@ default: all
 
 all-here:
 
-dont_install_libs = yes
 include $(top_srcdir)/rules $(top_srcdir)/phony
 
 install-include:
diff --git a/include/Makefile b/include/Makefile
@@ -28,7 +28,6 @@ all-here: features.h linker.h syscall-list.h
 
 include $(top_srcdir)/phony
 
-dont_install_libs = yes
 include $(top_srcdir)/rules
 
 GENSYS = AWK=$(AWK) $(csrcdir)/gensys 
diff --git a/include/arpa/Makefile b/include/arpa/Makefile
@@ -25,7 +25,6 @@ all-here:
 
 include $(top_srcdir)/phony
 
-dont_install_libs = yes
 include $(top_srcdir)/rules
 
 includefiles = $(filter %.h, $(MISCFILES))
diff --git a/include/bits/Makefile b/include/bits/Makefile
@@ -27,7 +27,6 @@ all-here:
 
 include $(top_srcdir)/phony
 
-dont_install_libs = yes
 include $(top_srcdir)/rules
 
 includefiles = $(filter %.h, $(MISCFILES))
diff --git a/include/bits/types/Makefile b/include/bits/types/Makefile
@@ -25,7 +25,6 @@ all-here:
 
 include $(top_srcdir)/phony
 
-dont_install_libs = yes
 include $(top_srcdir)/rules
 
 includefiles = $(filter %.h, $(MISCFILES))
diff --git a/include/mint/Makefile b/include/mint/Makefile
@@ -27,7 +27,6 @@ all-here:
 
 include $(top_srcdir)/phony
 
-dont_install_libs = yes
 include $(top_srcdir)/rules
 
 includefiles = $(filter %.h, $(MISCFILES))
diff --git a/include/mint/arch/Makefile b/include/mint/arch/Makefile
@@ -25,7 +25,6 @@ all-here:
 
 include $(top_srcdir)/phony
 
-dont_install_libs = yes
 include $(top_srcdir)/rules
 
 includefiles = $(filter %.h, $(MISCFILES))
diff --git a/include/net/Makefile b/include/net/Makefile
@@ -25,7 +25,6 @@ all-here:
 
 include $(top_srcdir)/phony
 
-dont_install_libs = yes
 include $(top_srcdir)/rules
 
 includefiles = $(filter %.h, $(MISCFILES))
diff --git a/include/netinet/Makefile b/include/netinet/Makefile
@@ -25,7 +25,6 @@ all-here:
 
 include $(top_srcdir)/phony
 
-dont_install_libs = yes
 include $(top_srcdir)/rules
 
 includefiles = $(filter %.h, $(MISCFILES))
diff --git a/include/nfs/Makefile b/include/nfs/Makefile
@@ -25,7 +25,6 @@ all-here:
 
 include $(top_srcdir)/phony
 
-dont_install_libs = yes
 include $(top_srcdir)/rules
 
 includefiles = $(filter %.h, $(MISCFILES))
diff --git a/include/protocols/Makefile b/include/protocols/Makefile
@@ -25,7 +25,6 @@ all-here:
 
 include $(top_srcdir)/phony
 
-dont_install_libs = yes
 include $(top_srcdir)/rules
 
 includefiles = $(filter %.h, $(MISCFILES))
diff --git a/include/rpc/Makefile b/include/rpc/Makefile
@@ -25,7 +25,6 @@ all-here:
 
 include $(top_srcdir)/phony
 
-dont_install_libs = yes
 include $(top_srcdir)/rules
 
 includefiles = $(filter %.h, $(MISCFILES))
diff --git a/include/rpcsvc/Makefile b/include/rpcsvc/Makefile
@@ -25,7 +25,6 @@ all-here:
 
 include $(top_srcdir)/phony
 
-dont_install_libs = yes
 include $(top_srcdir)/rules
 
 includefiles = $(filter %.h, $(MISCFILES))
diff --git a/include/sys/Makefile b/include/sys/Makefile
@@ -25,7 +25,6 @@ all-here:
 
 include $(top_srcdir)/phony
 
-dont_install_libs = yes
 include $(top_srcdir)/rules
 
 includefiles = $(filter %.h, $(MISCFILES))
diff --git a/login/Makefile b/login/Makefile
@@ -26,7 +26,6 @@ default: all
 
 all-here:
 
-dont_install_libs = yes
 include $(top_srcdir)/rules $(top_srcdir)/phony
 
 TESTS = utmp
diff --git a/mintlib/Makefile b/mintlib/Makefile
@@ -24,7 +24,6 @@ default: all
 
 all-here: syscalls.h
 
-dont_install_libs = yes
 include $(top_srcdir)/rules $(top_srcdir)/phony
 
 TESTS = assert assert-perr atexit ctype ctype1 dirent mallocbug seekdir \
diff --git a/misc/Makefile b/misc/Makefile
@@ -26,7 +26,6 @@ default: all
 
 all-here:
 
-dont_install_libs = yes
 include $(top_srcdir)/rules $(top_srcdir)/phony
 
 TESTS = dirname efgcvt fdset tsearch
diff --git a/multibyte/Makefile b/multibyte/Makefile
@@ -26,7 +26,6 @@ default: all
 
 all-here:
 
-dont_install_libs = yes
 include $(top_srcdir)/rules $(top_srcdir)/phony
 
 # FIXME: stratcliff still missing because of missing mman.h.
diff --git a/posix/Makefile b/posix/Makefile
@@ -26,7 +26,6 @@ default: all
 
 all-here:
 
-dont_install_libs = yes
 include $(top_srcdir)/rules $(top_srcdir)/phony
 
 # FIXME: The test runp fails with an illegal instruction.  We omit
diff --git a/pwdgrp/Makefile b/pwdgrp/Makefile
@@ -26,7 +26,6 @@ default: all
 
 all-here:
 
-dont_install_libs = yes
 include $(top_srcdir)/rules $(top_srcdir)/phony
 
 TESTS = grp
diff --git a/rules b/rules
@@ -26,11 +26,6 @@ install-recursive
 
 uninstall: uninstall-recursive uninstall-include uninstall-lib uninstall-man
 
-ifdef dont_install_libs
-install-lib:
-
-else
-
 baselibs = $(basename $(LIBS))
 
 install-lib:
@@ -54,7 +49,6 @@ uninstall-lib:
 	  echo " rm -f $(DESTDIR)$(libdir)/$(instdir)/$$p"; \
 	  rm -f $(DESTDIR)$(libdir)/$(instdir)/$$p; \
 	done
-endif
 
 check: check-recursive
 
@@ -83,8 +77,8 @@ distdir: $(DISTFILES) distdir-local
 distdir-local:
 
 all-recursive clean-recursive bakclean-recursive check-recursive \
-install-recursive uninstall-recursive install-lib-recursive \
-install-include-recursive install-man-recursive uninstall-lib-recursive \
+install-recursive uninstall-recursive \
+install-include-recursive install-man-recursive \
 uninstall-include-recursive uninstall-man-recursive dist-recursive:
 	@set fnord $(MAKEFLAGS); amf=$$2; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -93,4 +87,3 @@ uninstall-include-recursive uninstall-man-recursive dist-recursive:
 	  (cd $$subdir && $(MAKE) -r $$target) \
 	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
 	done && test -z "$$fail"
-
diff --git a/shadow/Makefile b/shadow/Makefile
@@ -26,7 +26,6 @@ default: all
 
 all-here:
 
-dont_install_libs = yes
 include $(top_srcdir)/rules $(top_srcdir)/phony
 
 check:
diff --git a/signal/Makefile b/signal/Makefile
@@ -26,7 +26,6 @@ default: all
 
 all-here:
 
-dont_install_libs = yes
 include $(top_srcdir)/rules $(top_srcdir)/phony
 
 TESTS = signal sigset
diff --git a/socket/Makefile b/socket/Makefile
@@ -33,7 +33,6 @@ include $(top_srcdir)/checkrules
 
 check-local:
 
-dont_install_libs = yes
 include $(top_srcdir)/rules $(top_srcdir)/phony
 
 install-include:
diff --git a/startup/Makefile b/startup/Makefile
@@ -15,8 +15,6 @@ subdir = startup
 
 default: all
 
-dont_install_libs = yes
-
 include $(top_srcdir)/configvars
 include $(top_srcdir)/bindist
 
diff --git a/stdiio/Makefile b/stdiio/Makefile
@@ -33,7 +33,6 @@ include $(top_srcdir)/checkrules
 
 all-here:
 
-dont_install_libs = yes
 include $(top_srcdir)/rules $(top_srcdir)/phony
 
 install-include:
diff --git a/stdio/Makefile b/stdio/Makefile
@@ -26,7 +26,6 @@ default: all
 
 all-here:
 
-dont_install_libs = yes
 include $(top_srcdir)/rules $(top_srcdir)/phony
 
 TESTS = bug1 bug2 bug3 bug4 bug5 bug6 bug7 bug8 bug9 bug10 bug11 bug12 \
diff --git a/stdlib/Makefile b/stdlib/Makefile
@@ -26,7 +26,6 @@ default: all
 
 all-here:
 
-dont_install_libs = yes
 include $(top_srcdir)/rules $(top_srcdir)/phony
 
 # NOTE: The test "cc" should come first!
diff --git a/string/Makefile b/string/Makefile
@@ -26,7 +26,6 @@ default: all
 
 all-here:
 
-dont_install_libs = yes
 include $(top_srcdir)/rules $(top_srcdir)/phony
 
 # FIXME: stratcliff still missing because of missing mman.h.
diff --git a/sunrpc/Makefile b/sunrpc/Makefile
@@ -32,7 +32,6 @@ else
 all-here: rpcgen rpcinfo
 endif
 
-dont_install_libs = yes
 include $(top_srcdir)/rules $(top_srcdir)/phony
 include $(srcdir)/RPCSVCCFILES
 include $(srcdir)/RPCGENCFILES
diff --git a/syscall/Makefile b/syscall/Makefile
@@ -26,7 +26,6 @@ gen_objs += syscallparser.c
 
 all-here: syscalls.stmp
 
-dont_install_libs = yes
 include $(top_srcdir)/rules $(top_srcdir)/phony
 
 # FIXME: Tests still missing.
diff --git a/sysvipc/Makefile b/sysvipc/Makefile
@@ -26,7 +26,6 @@ default: all
 
 all-here:
 
-dont_install_libs = yes
 include $(top_srcdir)/rules $(top_srcdir)/phony
 
 install-include:
diff --git a/termios/Makefile b/termios/Makefile
@@ -26,7 +26,6 @@ default: all
 
 all-here:
 
-dont_install_libs = yes
 include $(top_srcdir)/rules $(top_srcdir)/phony
 
 install-include:
diff --git a/time/Makefile b/time/Makefile
@@ -26,7 +26,6 @@ default: all
 
 all-here:
 
-dont_install_libs = yes
 include $(top_srcdir)/rules $(top_srcdir)/phony
 
 TESTS = clock getdate posixtz strptime time
diff --git a/tz/Makefile b/tz/Makefile
@@ -22,8 +22,6 @@ srcdir = .
 top_srcdir = ..
 subdir = tz
 
-dont_install_libs = yes
-
 include $(top_srcdir)/configvars
 
 default: all
diff --git a/unix/Makefile b/unix/Makefile
@@ -26,7 +26,6 @@ default: all
 
 all-here:
 
-dont_install_libs = yes
 include $(top_srcdir)/rules $(top_srcdir)/phony
 
 TESTS = fdset open opendir select stat time utime vfork
