aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2013-11-23 23:56:23 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2013-11-23 23:56:23 +0000
commitc7547cff1951aec5e36580a8497dd13020dfc8d3 (patch)
treeee876d61fbaa028c1a5c456ba69569e96ce89173
parent2bd0fcc9663211cc480f61dc9e05f43ac9ecca69 (diff)
Install into $(libdir) instead of $(pkglibdir)
We don't need $(pkglibdir) anymore, since the libraries themselves have a "nix" prefix now.
-rw-r--r--Makefile.lib4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.lib b/Makefile.lib
index 38370c2fe..b9114a07c 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