diff options
| author | midipix <writeonce@midipix.org> | 2020-01-10 15:59:38 +0000 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2020-01-10 16:02:54 +0000 |
| commit | 8936c4101cce3d2d68e36f4b3b98e2ae17b5bf76 (patch) | |
| tree | 0017879ca01747c66c51a1b96b8294a62bcea366 | |
| parent | 3be63fa06627ff2a09d92f3729f0818389702871 (diff) | |
| download | ntux-8936c4101cce3d2d68e36f4b3b98e2ae17b5bf76.tar.bz2 ntux-8936c4101cce3d2d68e36f4b3b98e2ae17b5bf76.tar.xz | |
build system: add --pkgbugs (where to file) and --pkghome (project home page).
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rwxr-xr-x | configure | 10 | ||||
| -rw-r--r-- | sofort/config/config.vars | 2 | ||||
| -rw-r--r-- | sofort/core/pkgconf.mk | 2 | ||||
| -rwxr-xr-x | sofort/tools/pkgconf.sh | 16 |
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@ @@ -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 |