From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/7831 Path: news.gmane.org!not-for-mail From: Ismael Luceno Newsgroups: gmane.linux.lib.musl.general Subject: [PATCH] Allow different paths for static and shared libraries Date: Sun, 31 May 2015 04:24:25 -0300 Message-ID: <1433057065-9167-1-git-send-email-ismael@iodev.co.uk> Reply-To: musl@lists.openwall.com NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1433057382 22032 80.91.229.3 (31 May 2015 07:29:42 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 31 May 2015 07:29:42 +0000 (UTC) Cc: Ismael Luceno To: musl@lists.openwall.com Original-X-From: musl-return-7843-gllmg-musl=m.gmane.org@lists.openwall.com Sun May 31 09:29:42 2015 Return-path: Envelope-to: gllmg-musl@m.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by plane.gmane.org with smtp (Exim 4.69) (envelope-from ) id 1Yyxgh-0000iw-DL for gllmg-musl@m.gmane.org; Sun, 31 May 2015 09:29:39 +0200 Original-Received: (qmail 26090 invoked by uid 550); 31 May 2015 07:29:37 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Original-Received: (qmail 22176 invoked from network); 31 May 2015 07:25:25 -0000 X-Mailer: git-send-email 2.4.1 Xref: news.gmane.org gmane.linux.lib.musl.general:7831 Archived-At: Signed-off-by: Ismael Luceno --- 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