summaryrefslogtreecommitdiff
path: root/build-aux/Makefile.once.head
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-06-01 13:02:33 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-06-01 13:02:33 -0400
commitbe77e289f05316c3cc17ff4546b8c8541f2d56bc (patch)
tree50056c3f9a67852bb1cdb1e653bbd12d59577fc3 /build-aux/Makefile.once.head
parenta2f1fc656c32923a479ba19f4b7e572166829385 (diff)
new autothing
Diffstat (limited to 'build-aux/Makefile.once.head')
-rw-r--r--build-aux/Makefile.once.head/00-dist.mk4
-rw-r--r--build-aux/Makefile.once.head/00-gnuconf.mk2
2 files changed, 3 insertions, 3 deletions
diff --git a/build-aux/Makefile.once.head/00-dist.mk b/build-aux/Makefile.once.head/00-dist.mk
index d5bfcd3d2f..4326cde72a 100644
--- a/build-aux/Makefile.once.head/00-dist.mk
+++ b/build-aux/Makefile.once.head/00-dist.mk
@@ -16,8 +16,8 @@
# Developer configuration
dist.exts ?= .tar.gz
-dist.pkgname ?= $(PACKAGE)
-dist.version ?= $(VERSION)
+dist.pkgname ?= $(firstword $(PACKAGE_TARNAME) $(PACKAGE) $(PACKAGE_NAME))
+dist.version ?= $(firstword $(PACKAGE_VERSION) $(VERSION))
ifeq ($(dist.pkgname),)
$(error dist.pkgname must be set)
diff --git a/build-aux/Makefile.once.head/00-gnuconf.mk b/build-aux/Makefile.once.head/00-gnuconf.mk
index 8e10f04f5c..83cb110c59 100644
--- a/build-aux/Makefile.once.head/00-gnuconf.mk
+++ b/build-aux/Makefile.once.head/00-gnuconf.mk
@@ -16,7 +16,7 @@
# This file is based on ยง7.2 "Makefile Conventions" of the release of
# the GNU Coding Standards dated April 13, 2016.
-gnuconf.pkgname ?= $(PACKAGE)
+gnuconf.pkgname ?= $(firstword $(PACKAGE_TARNAME) $(PACKAGE) $(PACKAGE_NAME))
ifeq ($(gnuconf.pkgname),)
$(error gnuconf.pkgname must be set)
endif