janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

defs.mk, make.mk: Fix package config installation from installed ytools

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2016-01-27 12:58:49 +00:00
commit 8597e3b87d
2 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
make/defs.mk
View file

@ -567,7 +567,13 @@ endif
ifneq ($(TARGET),mingw)
INSTALLATION_FILE_TYPES += PKG_CONFIG
PKG_CONFIG += $(sort $(filter-out $(DONT_INSTALL),$(wildcard *.pc) $(LOCAL_PKG_CONFIG)))
ifeq ($(DEVELOPMENT),true)
BUILD_PKG_CONFIGDIR = $(MODDIR)/pkgconfig
else
BUILD_PKG_CONFIGDIR = $(TOPDIR)/make
endif
LOCAL_PKG_CONFIG = $(PROJECT).pc
BUILD_PKG_CONFIG = $(BUILD_PKG_CONFIGDIR)/$(LOCAL_PKG_CONFIG)
INSTALLED_PKG_CONFIG = $(addprefix $(INSTALL_PKG_CONFIGDIR)/,$(PKG_CONFIG))
endif
@ -1764,8 +1770,8 @@ endif
#PREREQ_RUN ?= $(PREREQ_INSTALL)
# TODO: remove this
PREREQ_BUILD += $(PREREQ_RUN)
PREREQ_BUILD += $(PREREQ_INSTALL)
#PREREQ_BUILD += $(PREREQ_RUN)
#PREREQ_BUILD += $(PREREQ_INSTALL)
ifeq ($(USE_SNDFILE),true)
LIBFLAGS += -lsndfile

9
make/make.mk
View file

@ -6,8 +6,8 @@
include $(MODDIR)/make/defs.mk
include $(MODDIR)/make/rules.mk
LOCAL_PKG_CONFIG = $(PROJECT).pc
BUILD_PKG_CONFIG = $(MODDIR)/pkgconfig/$(LOCAL_PKG_CONFIG)
#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 +19,8 @@ ifneq ($(wildcard pckg-defs.mk),)
INSTALLED_PKG_MK += $(INSTALL_PCKG_DEFS_DIR)/$(PROJECT).mk
endif
all: $(BUILD_PKG_CONFIG)
#all: $(BUILD_PKG_CONFIG)
all: build_PKG_CONFIG
install: install_MAKE $(INSTALLED_PKG_MK) install_PKG_CONFIG
clean: textclean localclean doneclean clean.pkg-config
test:
@ -56,7 +57,7 @@ $(LOCAL_PKG_CONFIG): $(PROJECT_DESCR_FILE) $(MODDIR)/make/make.mk $(MOD_SCRIPT_D
> $@.tmp
mv $@.tmp $@
#$(BUILD_PKG_CONFIG): $(LOCAL_PKG_CONFIG)
$(BUILD_PKG_CONFIG): $(LOCAL_PKG_CONFIG)
clean.pkg-config:
rm -f *.pc $(BUILD_PKG_CONFIG)