From c7547cff1951aec5e36580a8497dd13020dfc8d3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 23 Nov 2013 23:56:23 +0000 Subject: [PATCH] Install into $(libdir) instead of $(pkglibdir) We don't need $(pkglibdir) anymore, since the libraries themselves have a "nix" prefix now. --- Makefile.lib | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.lib b/Makefile.lib index 38370c2fec..b9114a07c0 100644 --- a/Makefile.lib +++ b/Makefile.lib @@ -73,7 +73,7 @@ define LIBS_template = $(1)_LDFLAGS_USE += -L$$(_d) -Wl,-rpath,$$(abspath $$(_d)) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME))) - $(1)_INSTALL_DIR := $$(pkglibdir) + $(1)_INSTALL_DIR := $$(libdir) $(1)_INSTALL_PATH := $$($(1)_INSTALL_DIR)/$$($(1)_NAME).so @@ -94,7 +94,7 @@ define LIBS_template = $(1)_LDFLAGS_USE += $$($(1)_PATH) $$($(1)_LDFLAGS) - $(1)_INSTALL_PATH := $$(pkglibdir)/$$($(1)_NAME).a + $(1)_INSTALL_PATH := $$(libdir)/$$($(1)_NAME).a endif