make, scripts: Some additions to package-config creation

Signed-off-by: Jan Lindemann <jan@janware.com>

make/defs-dev.mk

@@ -6,6 +6,7 @@
 # -- files
 #CONTRIBDIR       ?= $(TOPDIR)/contrib
 PROJECT_DIRNAME  ?= $(PROJECT)
+PROJECT_DIRPATH  ?= $(shell readlink -f $(TOPDIR))
 PREFIX           ?= $(ENV_PREFIX)$(HOME)/dat/test/$(FLAVOUR_PREFIX)$(PROJECT_DIRNAME)-$(VERSION)
 VAR_PREFIX       ?= $(PREFIX)/var
 DOC_PREFIX       ?= $(PREFIX)/doc/$(PROJECT)

make/defs-dist.mk

@@ -6,7 +6,8 @@
 # -- files
 #CONTRIBDIR       ?= $(TOPDIR)/contrib
 PROJECT_DIRNAME  ?= $(PROJECT)
-PREFIX           ?= $(ENV_PREFIX)/opt/$(FLAVOUR_PATH_PREFIX)$(PROJECT_DIRNAME)
+PROJECT_DIRPATH  ?= /opt/$(FLAVOUR_PATH_PREFIX)$(PROJECT_DIRNAME)
+PREFIX           ?= $(ENV_PREFIX)$(PROJECT_DIRPATH)
 VAR_PREFIX       ?= $(ENV_PREFIX)/var/$(FLAVOUR_PATH_PREFIX)lib
 DOC_PREFIX       ?= $(ENV_PREFIX)/usr/share/doc/packages/$(FLAVOUR_PREFIX)$(PROJECT_DIRNAME)
 EXE_PREFIX       ?= $(PREFIX)

make/make.mk

@@ -38,10 +38,18 @@ install-links:
 do-install-links:
 	@$(call install_links,MAKE)
 
+ifeq ($(USE_PROJECT_LIB),true)
+CREATE_PKG_CONFIG_OPTS += -V blah=blub
+endif
+
 $(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 $< \
+		-n $(PROJECT) \
+		-v $(DIST_VERSION) \
+		-p $(PROJECT_DIRPATH) \
+		-V $(shell echo $(PROJECT) | tr a-z- A-Z_)_DIR=$(PROJECT_DIRPATH) \
+		$(CREATE_PKG_CONFIG_OPTS) \
 		> $@.tmp
 	mv $@.tmp $@
 

scripts/create-pkg-config.sh

@@ -1,5 +1,13 @@
 #!/bin/bash
 
+try_assign_sec()
+{
+	local file="$1"
+	local sec="$2"
+	local val=`_ytools_cat_section "$file" "$sec"`
+	[ -n "$val" ] && eval $3=\"$val\"
+}
+
 usage()
 {
 	cat <<- EOT | sed 's/^	*|//'
@@ -21,7 +29,7 @@ set -e
 project_descr_file="$1"
 myname=`basename $0`
 
-eval set -- `getopt -- F:d: "$@"`
+eval set -- `getopt -- hF:d:n:s:p:v:V: "$@"`
 
 while [ "$1" != -- ]; do
 case $1 in
@@ -35,6 +43,26 @@ case $1 in
 		description="$2"
 		shift
 		;;
+	-n)
+		name="$2"
+		shift
+		;;
+	-s)
+		summary="$2"
+		shift
+		;;
+	-p)
+		prefix="$2"
+		shift
+		;;
+	-v)
+		version="$2"
+		shift
+		;;
+	-V)
+		variables="$variables$2\n"
+		shift
+		;;
 	*)
 		usage 1;;
 esac
@@ -44,18 +72,20 @@ shift
 
 [ -r "$project_descr_file" ] && {
 	. ytools-functions.sh
-	descr=`_ytools_cat_section "$project_descr_file" description`
+	try_assign_sec $project_descr_file description descr
+	try_assign_sec $project_descr_file summary summary
 }
 
+[ "$variables" ] && echo -e "$variables"
 cat <<-EOT
-prefix=/usr
+prefix=$prefix
 exec_prefix=\${prefix}
 includedir=\${prefix}/include
 libdir=\${exec_prefix}/lib
 
-Name: foo
+Name: $name
-Description: $descr
+Description: $summary
-Version: 1.0.0
+Version: $version
 Cflags: -I\${includedir}/foo
 Libs: -L\${libdir} -lfoo
 EOT