From 3c870263c5a14b77628f83c06852a6f340b2443f Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Fri, 17 Feb 2012 23:17:48 -0500 Subject: two fixes for "make install" handling of shared libs 1. don't try to install (and thus build) shared libs when they were disabled in config.mak 2. ensure that the path for the dynamic linker exists before attempting to install it. --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f0278075..15ab4fc4 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,7 @@ LDSO_PATHNAME = $(syslibdir)/ld-musl-$(ARCH).so.1 all: $(ALL_LIBS) $(ALL_TOOLS) -install: $(ALL_LIBS:lib/%=$(DESTDIR)$(libdir)/%) $(ALL_INCLUDES:include/%=$(DESTDIR)$(includedir)/%) $(ALL_TOOLS:tools/%=$(DESTDIR)$(bindir)/%) $(DESTDIR)$(LDSO_PATHNAME) +install: $(ALL_LIBS:lib/%=$(DESTDIR)$(libdir)/%) $(ALL_INCLUDES:include/%=$(DESTDIR)$(includedir)/%) $(ALL_TOOLS:tools/%=$(DESTDIR)$(bindir)/%) $(if $(SHARED_LIBS),$(DESTDIR)$(LDSO_PATHNAME),) clean: rm -f crt/*.o @@ -110,6 +110,7 @@ $(DESTDIR)$(includedir)/%: include/% install -D -m 644 $< $@ $(DESTDIR)$(LDSO_PATHNAME): lib/libc.so + install -d -m 755 $(DESTDIR)$(syslibdir) ln -sf $(libdir)/libc.so $@ || true .PRECIOUS: $(CRT_LIBS:lib/%=crt/%) -- cgit v1.2.1