diff --git a/make/defs.mk b/make/defs.mk index 617d2ef6..fb421c1d 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -554,7 +554,7 @@ endif # -- CRONTAB ifneq ($(TARGET),mingw) INSTALLATION_FILE_TYPES += CRONTAB -CRONTAB += $(filter-out $(DONT_INSTALL),$(wildcard *.crontab)) +CRONTAB += $(filter-out $(DONT_INSTALL),$(wildcard *.crontab)) BUILD_CRONTABDIR = $(TOPDIR)/cron.d INSTALLED_CRONTAB = $(addprefix $(INSTALL_CRONTABDIR)/,$(CRONTAB)) endif @@ -562,7 +562,7 @@ endif # -- PKG_CONFIG ifneq ($(TARGET),mingw) INSTALLATION_FILE_TYPES += PKG_CONFIG -PKG_CONFIG += $(filter-out $(DONT_INSTALL),$(wildcard *.pc)) +PKG_CONFIG += $(sort $(filter-out $(DONT_INSTALL),$(wildcard *.pc) $(LOCAL_PKG_CONFIG))) BUILD_PKG_CONFIGDIR = $(MODDIR)/pkgconfig INSTALLED_PKG_CONFIG = $(addprefix $(INSTALL_PKG_CONFIGDIR)/,$(PKG_CONFIG)) endif diff --git a/make/make.mk b/make/make.mk index 27d64e80..08a0331c 100644 --- a/make/make.mk +++ b/make/make.mk @@ -6,7 +6,8 @@ include $(MODDIR)/make/defs.mk include $(MODDIR)/make/rules.mk -BUILD_PKG_CONFIG = $(PROJECT).pc +LOCAL_PKG_CONFIG = $(PROJECT).pc +BUILD_PKG_CONFIG = $(MODDIR)/pkgconfig/$(LOCAL_PKG_CONFIG) INSTALL_PCKG_DEPS_DIR = $(ENV_PREFIX)$(MODDIR)/make/deps.d ifneq ($(wildcard pckg-deps.mk),) @@ -19,7 +20,7 @@ INSTALLED_PKG_MK += $(INSTALL_PCKG_DEFS_DIR)/$(PROJECT).mk endif all: $(BUILD_PKG_CONFIG) -install: install_MAKE $(INSTALLED_PKG_MK) +install: install_MAKE $(INSTALLED_PKG_MK) install_PKG_CONFIG clean: textclean localclean doneclean clean.pkg-config test: @@ -37,14 +38,16 @@ install-links: do-install-links: @$(call install_links,MAKE) -$(BUILD_PKG_CONFIG): $(PROJECT_DESCR_FILE) $(MODDIR)/make/make.mk $(MOD_SCRIPT_DIR)/create-pkg-config.sh +$(LOCAL_PKG_CONFIG): $(PROJECT_DESCR_FILE) $(MODDIR)/make/make.mk $(MOD_SCRIPT_DIR)/create-pkg-config.sh /bin/bash $(MOD_SCRIPT_DIR)/create-pkg-config.sh \ -d "$(PROJECT_DESCR)" \ -F $< \ > $@.tmp mv $@.tmp $@ +#$(BUILD_PKG_CONFIG): $(LOCAL_PKG_CONFIG) + clean.pkg-config: - rm -f *.pc + rm -f *.pc $(BUILD_PKG_CONFIG) diff --git a/scripts/pkg.sh b/scripts/pkg.sh index a79c306b..4d960f8c 100644 --- a/scripts/pkg.sh +++ b/scripts/pkg.sh @@ -799,7 +799,7 @@ cmd_milk_install_log() in=$1 out=$2 - local filter_devel='/include/.*.h$\|devel\|make\|lib.*\.a$\|lib.*\.so$\|.*\.exp$\|.*\.def$\|.*\.lib$' + local filter_devel='/include/.*.h$\|devel\|make\|lib.*\.a$\|lib.*\.so$\|.*\.exp$\|.*\.def$\|.*\.lib$\|\.pc$' # TODO: simplify this case $type in