commit 497e7c93a7962f749885fce86fa6c1ee0760e183
Author: Pavel Zhukov <pzhukov@redhat.com>
Date: Mon Jul 17 10:21:13 2017 +0200
Add configuration for libdir
diff --git a/Makefile b/Makefile
index b591cb9..8c15dea 100644
--- a/Makefile
+++ b/Makefile
@@ -32,6 +32,7 @@ BUILD = production
PROCESSORS = 0
BUILD_DIR =
SOURCE_DIR := $(shell dirname "$(MAKEFILE_LIST)")
+LIB_DIR = ${prefix}/lib
# Load current setup if any
-include makefile.setup
@@ -152,21 +153,21 @@ libgpr.install.static:
$(LIBGPR_INSTALLER) \
-XLIBRARY_TYPE=static \
-XXMLADA_BUILD=static \
- --lib-subdir=lib/gpr/static \
+ --lib-subdir=${LIB_DIR}/gpr/static \
--build-name=static
libgpr.install.static-pic:
$(LIBGPR_INSTALLER) \
-XLIBRARY_TYPE=static-pic \
-XXMLADA_BUILD=static-pic \
- --lib-subdir=lib/gpr/static-pic \
+ --lib-subdir=${LIB_DIR}/gpr/static-pic \
--build-name=static-pic
libgpr.install.shared:
$(LIBGPR_INSTALLER) \
-XLIBRARY_TYPE=relocatable \
-XXMLADA_BUILD=relocatable \
- --lib-subdir=lib/gpr/relocatable \
+ --lib-subdir=${LIB_DIR}/gpr/relocatable \
--build-name=relocatable
libgpr.uninstall:
--- a/Makefile 2017-07-19 12:30:53.745753307 +0200
+++ b/Makefile.edit 2017-07-19 12:38:48.012854427 +0200
@@ -154,6 +154,7 @@
-XLIBRARY_TYPE=static \
-XXMLADA_BUILD=static \
--lib-subdir=${LIB_DIR}/gpr/static \
+ --link-lib-subdir=${LIB_DIR}/ \
--build-name=static
libgpr.install.static-pic:
@@ -161,6 +162,7 @@
-XLIBRARY_TYPE=static-pic \
-XXMLADA_BUILD=static-pic \
--lib-subdir=${LIB_DIR}/gpr/static-pic \
+ --link-lib-subdir=${LIB_DIR} \
--build-name=static-pic
libgpr.install.shared:
@@ -168,6 +170,7 @@
-XLIBRARY_TYPE=relocatable \
-XXMLADA_BUILD=relocatable \
--lib-subdir=${LIB_DIR}/gpr/relocatable \
+ --link-lib-subdir=${LIB_DIR} \
--build-name=relocatable
libgpr.uninstall: