summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2020-01-10 15:59:38 +0000
committermidipix <writeonce@midipix.org>2020-01-10 16:02:54 +0000
commit027b669cb08f2791ed193a008db6da6c73dd2193 (patch)
tree5e4bf73c21e5fc54f2fdd358609b49e69f7413af
parent20ad28f5a92cf2c84a9085b8ff2f196b11b90c7b (diff)
downloadperk-027b669cb08f2791ed193a008db6da6c73dd2193.tar.bz2
perk-027b669cb08f2791ed193a008db6da6c73dd2193.tar.xz
build system: add --pkgbugs (where to file) and --pkghome (project home page).
-rw-r--r--Makefile.in2
-rwxr-xr-xconfigure10
-rw-r--r--sofort/config/config.vars2
-rw-r--r--sofort/core/pkgconf.mk2
-rwxr-xr-xsofort/tools/pkgconf.sh16
5 files changed, 32 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in
index b1f3bae..f8fcdb9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -15,6 +15,8 @@ PKGUSRC = @pkgusrc@
PKGREPO = @pkgrepo@
PKGPSRC = @pkgpsrc@
PKGDURL = @pkgdurl@
+PKGBUGS = @pkgbugs@
+PKGHOME = @pkghome@
PKGDEFS = @pkgdefs@
PKGLIBS = @pkglibs@
diff --git a/configure b/configure
index 66e2b34..cb0b6e8 100755
--- a/configure
+++ b/configure
@@ -352,6 +352,8 @@ common_defaults()
[ -n "$mb_pkgrepo" ] || mb_pkgrepo="$mb_default_pkgrepo"
[ -n "$mb_pkgpsrc" ] || mb_pkgpsrc="$mb_default_pkgpsrc"
[ -n "$mb_pkgdurl" ] || mb_pkgdurl="$mb_default_pkgdurl"
+ [ -n "$mb_pkgbugs" ] || mb_pkgbugs="$mb_default_pkgbugs"
+ [ -n "$mb_pkghome" ] || mb_pkghome="$mb_default_pkghome"
[ -n "$mb_pkgdefs" ] || mb_pkgdefs="$mb_default_pkgdefs"
[ -n "$mb_pkglibs" ] || mb_pkglibs="$mb_default_pkglibs"
@@ -854,6 +856,14 @@ for arg ; do
mb_pkgdurl=${arg#*=}
;;
+ --pkgbugs=*)
+ mb_pkgbugs=${arg#*=}
+ ;;
+
+ --pkghome=*)
+ mb_pkghome=${arg#*=}
+ ;;
+
--pkgdefs=*)
mb_pkgdefs=${arg#*=}
;;
diff --git a/sofort/config/config.vars b/sofort/config/config.vars
index 80d8535..229a598 100644
--- a/sofort/config/config.vars
+++ b/sofort/config/config.vars
@@ -16,6 +16,8 @@ pkgusrc
pkgrepo
pkgpsrc
pkgdurl
+pkgbugs
+pkghome
pkgdefs
pkglibs
diff --git a/sofort/core/pkgconf.mk b/sofort/core/pkgconf.mk
index 4f6c865..0edc395 100644
--- a/sofort/core/pkgconf.mk
+++ b/sofort/core/pkgconf.mk
@@ -20,6 +20,8 @@ build/$(PACKAGE).pc:
PKGCONF_REPO='$(PKGREPO)' \
PKGCONF_PSRC='$(PKGPSRC)' \
PKGCONF_DURL='$(PKGDURL)' \
+ PKGCONF_BUGS='$(PKGBUGS)' \
+ PKGCONF_HOME='$(PKGHOME)' \
PKGCONF_DEFS='$(PKGDEFS)' \
PKGCONF_LIBS='$(PKGLIBS)' \
\
diff --git a/sofort/tools/pkgconf.sh b/sofort/tools/pkgconf.sh
index bcde970..a69c25b 100755
--- a/sofort/tools/pkgconf.sh
+++ b/sofort/tools/pkgconf.sh
@@ -94,6 +94,20 @@ else
pkgconf_durl="Distro: ${PKGCONF_DURL}"
fi
+# bug reports (optional)
+if [ -z "${PKGCONF_BUGS}" ]; then
+ pkgconf_bugs='#'
+else
+ pkgconf_bugs="Bug reports: ${PKGCONF_BUGS}"
+fi
+
+# project home page (optional)
+if [ -z "${PKGCONF_HOME}" ]; then
+ pkgconf_home='#'
+else
+ pkgconf_home="Home page: ${PKGCONF_HOME}"
+fi
+
# output (without trailing spaces)
cat << _EOF | grep -v '^#' | sed 's/[ \t]*$//'
@@ -110,6 +124,8 @@ Version: ${PKGCONF_VERSION}
$pkgconf_repo
$pkgconf_psrc
$pkgconf_durl
+$pkgconf_bugs
+$pkgconf_home
Cflags: $pkgconf_cflags
Libs: $pkgconf_ldflags