mailing list of musl libc
 help / color / mirror / code / Atom feed
* [PATCH] Allow different paths for static and shared libraries
@ 2015-05-31  7:24 Ismael Luceno
  2015-05-31  7:31 ` Rich Felker
  0 siblings, 1 reply; 10+ messages in thread
From: Ismael Luceno @ 2015-05-31  7:24 UTC (permalink / raw)
  To: musl; +Cc: Ismael Luceno

Signed-off-by: Ismael Luceno <ismael@iodev.co.uk>
---
 Makefile  | 5 ++++-
 configure | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 3bd7b4d..cffe068 100644
--- a/Makefile
+++ b/Makefile
@@ -14,6 +14,7 @@ bindir = $(exec_prefix)/bin
 prefix = /usr/local/musl
 includedir = $(prefix)/include
 libdir = $(prefix)/lib
+shlibdir = $(libdir)
 syslibdir = /lib
 
 SRCS = $(sort $(wildcard src/*/*.c arch/$(ARCH)/src/*.c))
@@ -174,7 +175,9 @@ $(DESTDIR)$(includedir)/%: include/%
 $(DESTDIR)$(LDSO_PATHNAME): $(DESTDIR)$(libdir)/libc.so
 	$(INSTALL) -D -l $(libdir)/libc.so $@ || true
 
-install-libs: $(ALL_LIBS:lib/%=$(DESTDIR)$(libdir)/%) $(if $(SHARED_LIBS),$(DESTDIR)$(LDSO_PATHNAME),)
+install-libs: $(filter-out $(SHARED_LIBS),$(ALL_LIBS:lib/%=$(DESTDIR)$(libdir)/%))
+install-libs: $(SHARED_LIBS:lib/%=$(DESTDIR)$(shlibdir)/%)
+install-libs: $(if $(SHARED_LIBS),$(DESTDIR)$(LDSO_PATHNAME),)
 
 install-headers: $(ALL_INCLUDES:include/%=$(DESTDIR)$(includedir)/%)
 
diff --git a/configure b/configure
index 7b29ae4..7450e29 100755
--- a/configure
+++ b/configure
@@ -16,6 +16,7 @@ Installation directories:
 Fine tuning of the installation directories:
   --bindir=DIR            user executables [EPREFIX/bin]
   --libdir=DIR            library files for the linker [PREFIX/lib]
+  --shlibdir=DIR          shared library files path [=libdir]
   --includedir=DIR        include files for the C compiler [PREFIX/include]
   --syslibdir=DIR         location for the dynamic linker [/lib]
 
@@ -121,6 +122,7 @@ prefix=/usr/local/musl
 exec_prefix='$(prefix)'
 bindir='$(exec_prefix)/bin'
 libdir='$(prefix)/lib'
+shlibdir='$(libdir)'
 includedir='$(prefix)/include'
 syslibdir='/lib'
 target=
@@ -139,6 +141,7 @@ case "$arg" in
 --exec-prefix=*) exec_prefix=${arg#*=} ;;
 --bindir=*) bindir=${arg#*=} ;;
 --libdir=*) libdir=${arg#*=} ;;
+--shlibdir=*) shlibdir=${arg#*=} ;;
 --includedir=*) includedir=${arg#*=} ;;
 --syslibdir=*) syslibdir=${arg#*=} ;;
 --enable-shared|--enable-shared=yes) shared=yes ;;
-- 
2.4.1



^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2015-06-06 18:21 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-05-31  7:24 [PATCH] Allow different paths for static and shared libraries Ismael Luceno
2015-05-31  7:31 ` Rich Felker
2015-05-31  9:10   ` Ismael Luceno
2015-05-31 16:30     ` Rich Felker
2015-05-31 21:51       ` Ismael Luceno
2015-06-01  1:27         ` Rich Felker
2015-06-01 18:41           ` Ismael Luceno
2015-06-01 18:58             ` Rich Felker
2015-06-01 18:54           ` Daniel Cegiełka
2015-06-06 18:21             ` Anthony G. Basile

Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/musl/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).