From b42abcf3ccda0a89330a9831bcda29c77eeb6583 Mon Sep 17 00:00:00 2001 From: Christophe de Dinechin Date: Tue, 19 Jun 2018 18:19:44 +0200 Subject: [PATCH] Add ability to put different package headers than install path The SPICE protocol package installs headers in /usr/include/spice-1/spice, but then returns -I/usr/include/spice-1, the code using #include So adding one level of indirection to deal with that case. --- config.mk | 5 +++++ rules.mk | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/config.mk b/config.mk index 619cbc3..6ddc6ae 100644 --- a/config.mk +++ b/config.mk @@ -69,6 +69,11 @@ PACKAGE_DIR?=$(PACKAGE_NAME:%=%/) PACKAGE_LIBS=$(MIQ_PRODLIB) PACKAGE_DLLS=$(MIQ_PRODDLL) +# Package configuration directories by default +PACKAGE_PREFIX?=$(PREFIX) +PACKAGE_PREFIX_LIB?=$(PREFIX_LIB) +PACKAGE_PREFIX_HDR?=$(PREFIX_HDR) + # Local setup - Location of configuration files, etc (tweaked at install time) -include $(MIQ)config.local-setup.mk CONFIG_SOURCES?=$(MIQ)config/ diff --git a/rules.mk b/rules.mk index 1a803ca..4996016 100644 --- a/rules.mk +++ b/rules.mk @@ -596,10 +596,10 @@ benchmark: $(BENCHMARKS:%=%.benchmark) MIQ_PACKAGELIBS=$(PACKAGE_LIBS:%.lib=$(LINK_LIB_OPT)%) \ $(PACKAGE_DLLS:%.dll=$(LINK_DLL_OPT)%) MIQ_GENPC= \ - (echo 'prefix=$(PREFIX:%/=%)' ;\ + (echo 'prefix=$(PACKAGE_PREFIX:%/=%)' ;\ echo 'exec_prefix=$${prefix}' ;\ - echo 'libdir=$(PREFIX_LIB:%/=%)' ;\ - echo 'includedir=$(PREFIX_HDR:%/=%)' ;\ + echo 'libdir=$(PACKAGE_PREFIX_LIB:%/=%)' ;\ + echo 'includedir=$(PACKAGE_PREFIX_HDR:%/=%)' ;\ echo 'Name: $(PACKAGE_NAME)' ;\ echo 'Description: $(PACKAGE_DESCRIPTION)' ;\ echo 'Version: $(PACKAGE_VERSION)' ;\