mirrors/Modest
1
0
Fork 0
mirror of https://github.com/lexborisov/Modest synced 2024-11-22 13:51:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #40 from mody/fix-pkgconfig-for-debian

Browse Source 
fixed prefix in pkgconfig for Debian
This commit is contained in:
Alexander 2018-03-20 19:14:37 +03:00 committed by GitHub
commit 050b1eb458
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -181,6 +181,7 @@ clean: $(MODEST_BUILD_MODULES_TARGET_CLEAN)
rm -f $(call MODEST_LIBRARY_WITH_VERSION) && rm -f $(call MODEST_LIBRARY_STATIC) rm -f $(call MODEST_LIBRARY_WITH_VERSION) && rm -f $(call MODEST_LIBRARY_STATIC)
rm -rf $(TEST_DIR_BASE) rm -rf $(TEST_DIR_BASE)
$(call MODEST_BUILD_CLEAN_AFTER) $(call MODEST_BUILD_CLEAN_AFTER)
rm $(MODEST_PKG_CONFIG_FILE)
for f in $(BUILD_SUB_DIRS); do $(MAKE) -C $$f clean; done for f in $(BUILD_SUB_DIRS); do $(MAKE) -C $$f clean; done
clone: clean_api $(MODEST_BUILD_MODULES_TARGET_CLONE) clone: clean_api $(MODEST_BUILD_MODULES_TARGET_CLONE)
@ -203,7 +204,9 @@ uninstall:
test: library test: library
$(MAKE) -C $(TEST_DIR) run $(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)) $(call MODEST_PKG_CONFIG_PROCESS,$(MODEST_PKG_CONFIG_FILE).in, $(MODEST_PKG_CONFIG_FILE))
modules: modules:

5
debian/rules vendored
View File

@ -6,5 +6,8 @@
%: %:
dh $@ --parallel dh $@ --parallel
override_dh_auto_build:
dh_auto_build -- prefix=/usr
override_dh_auto_install: override_dh_auto_install:
prefix=/usr dh_auto_install -- dh_auto_install -- prefix=/usr

2
modest.pc.in
View File

@ -7,4 +7,4 @@ Name: @libname@
Description: @description@ Description: @description@
Version: @version@ Version: @version@
Cflags: @cflags@ Cflags: @cflags@
Libs: -L${libdir} -l@libname@ Libs: -L${libdir} -l@libname@ -lm