From 6a044b2cac46f7103b2b984f9e1be6f9d22bd587 Mon Sep 17 00:00:00 2001 From: Patrik Modesto Date: Tue, 20 Mar 2018 16:58:09 +0100 Subject: [PATCH] fixed prefix in pkgconfig for Debian --- Makefile | 5 ++++- debian/rules | 5 ++++- modest.pc.in | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 36e3976..8fa2375 100644 --- a/Makefile +++ b/Makefile @@ -181,6 +181,7 @@ clean: $(MODEST_BUILD_MODULES_TARGET_CLEAN) rm -f $(call MODEST_LIBRARY_WITH_VERSION) && rm -f $(call MODEST_LIBRARY_STATIC) rm -rf $(TEST_DIR_BASE) $(call MODEST_BUILD_CLEAN_AFTER) + rm $(MODEST_PKG_CONFIG_FILE) for f in $(BUILD_SUB_DIRS); do $(MAKE) -C $$f clean; done clone: clean_api $(MODEST_BUILD_MODULES_TARGET_CLONE) @@ -203,7 +204,9 @@ uninstall: test: library $(MAKE) -C $(TEST_DIR) run -make-pc-file: +make-pc-file: $(MODEST_PKG_CONFIG_FILE) + +$(MODEST_PKG_CONFIG_FILE): $(MODEST_PKG_CONFIG_FILE).in $(call MODEST_PKG_CONFIG_PROCESS,$(MODEST_PKG_CONFIG_FILE).in, $(MODEST_PKG_CONFIG_FILE)) modules: diff --git a/debian/rules b/debian/rules index 282f914..6f70f45 100755 --- a/debian/rules +++ b/debian/rules @@ -6,5 +6,8 @@ %: dh $@ --parallel +override_dh_auto_build: + dh_auto_build -- prefix=/usr + override_dh_auto_install: - prefix=/usr dh_auto_install -- + dh_auto_install -- prefix=/usr diff --git a/modest.pc.in b/modest.pc.in index 85b0276..72c6be0 100644 --- a/modest.pc.in +++ b/modest.pc.in @@ -7,4 +7,4 @@ Name: @libname@ Description: @description@ Version: @version@ Cflags: @cflags@ -Libs: -L${libdir} -l@libname@ +Libs: -L${libdir} -l@libname@ -lm