Merge pull request #5310 from kmk3/build-use-tarname

build: add and use TARNAME instead of NAME for paths

4 files changed, 22 insertions, 19 deletions

diff --git a/Makefile b/Makefile
index eb49f9ac9..0ea19a48a 100644
--- a/Makefile
+++ b/Makefile
@@ -124,8 +124,8 @@ ifeq ($(HAVE_CONTRIB_INSTALL),yes)
         install -m 0644 contrib/vim/syntax/firejail.vim $(DESTDIR)$(datarootdir)/vim/vimfiles/syntax
 endif
         # documents
-        install -m 0755 -d $(DESTDIR)$(DOCDIR)
-        install -m 0644 -t $(DESTDIR)$(DOCDIR) COPYING README RELNOTES etc/templates/*
+        install -m 0755 -d $(DESTDIR)$(docdir)
+        install -m 0644 -t $(DESTDIR)$(docdir) COPYING README RELNOTES etc/templates/*
         # profiles and settings
         install -m 0755 -d $(DESTDIR)$(sysconfdir)/firejail
         install -m 0644 -t $(DESTDIR)$(sysconfdir)/firejail src/firecfg/firecfg.config
@@ -221,14 +221,14 @@ dist: config.mk
         make distclean
         mv config.status.old config.status
         mv config.sh.old config.sh
-        rm -fr $(NAME)-$(VERSION) $(NAME)-$(VERSION).tar.xz
-        mkdir -p $(NAME)-$(VERSION)/test
-        cp -a $(DISTFILES) $(NAME)-$(VERSION)
-        cp -a $(DISTFILES_TEST) $(NAME)-$(VERSION)/test
-        rm -rf $(NAME)-$(VERSION)/src/tools
-        find $(NAME)-$(VERSION) -name .svn -delete
-        tar -cJvf $(NAME)-$(VERSION).tar.xz $(NAME)-$(VERSION)
-        rm -fr $(NAME)-$(VERSION)
+        rm -fr $(TARNAME)-$(VERSION) $(TARNAME)-$(VERSION).tar.xz
+        mkdir -p $(TARNAME)-$(VERSION)/test
+        cp -a $(DISTFILES) $(TARNAME)-$(VERSION)
+        cp -a $(DISTFILES_TEST) $(TARNAME)-$(VERSION)/test
+        rm -rf $(TARNAME)-$(VERSION)/src/tools
+        find $(TARNAME)-$(VERSION) -name .svn -delete
+        tar -cJvf $(TARNAME)-$(VERSION).tar.xz $(TARNAME)-$(VERSION)
+        rm -fr $(TARNAME)-$(VERSION)
 
 asc: config.mk
         ./mkasc.sh $(VERSION)
@@ -240,11 +240,11 @@ deb-apparmor: dist config.sh
         ./mkdeb.sh -apparmor --enable-apparmor
 
 test-compile: dist config.mk
-        cd test/compile; ./compile.sh $(NAME)-$(VERSION)
+        cd test/compile; ./compile.sh $(TARNAME)-$(VERSION)
 
 .PHONY: rpms
 rpms: src/man config.mk
-        ./platform/rpm/mkrpm.sh $(NAME) $(VERSION)
+        ./platform/rpm/mkrpm.sh $(TARNAME) $(VERSION)
 
 extras: all
         $(MAKE) -C extras/firetools
diff --git a/config.mk.in b/config.mk.in
index e0be0e656..9973b7eaa 100644
--- a/config.mk.in
+++ b/config.mk.in
@@ -7,19 +7,20 @@
 # up overriding the includer's intended default target (which by default is the
 # first target encountered).
 
-CC=@CC@
+NAME=@PACKAGE_NAME@
+TARNAME=@PACKAGE_TARNAME@
+PACKAGE_TARNAME=@PACKAGE_TARNAME@ # needed by docdir
+VERSION=@PACKAGE_VERSION@
+
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
 libdir=@libdir@
 datarootdir=@datarootdir@
+docdir=@docdir@
 mandir=@mandir@
 sysconfdir=@sysconfdir@
 
-VERSION=@PACKAGE_VERSION@
-NAME=@PACKAGE_NAME@
-PACKAGE_TARNAME=@PACKAGE_TARNAME@
-DOCDIR=@docdir@
 HAVE_APPARMOR=@HAVE_APPARMOR@
 HAVE_CONTRIB_INSTALL=@HAVE_CONTRIB_INSTALL@
 BUSYBOX_WORKAROUND=@BUSYBOX_WORKAROUND@
@@ -50,6 +51,7 @@ HAVE_ONLY_SYSCFG_PROFILES=@HAVE_ONLY_SYSCFG_PROFILES@
 
 MANFLAGS = $(HAVE_LTS) $(HAVE_OUTPUT) $(HAVE_X11) $(HAVE_PRIVATE_HOME) $(HAVE_APPARMOR) $(HAVE_IDS) $(HAVE_OVERLAYFS) $(HAVE_USERTMPFS) $(HAVE_DBUSPROXY) $(HAVE_FIRETUNNEL) $(HAVE_GLOBALCFG) $(HAVE_CHROOT) $(HAVE_NETWORK) $(HAVE_USERNS) $(HAVE_FILE_TRANSFER) $(HAVE_SELINUX) $(HAVE_SUID) $(HAVE_FORCE_NONEWPRIVS) $(HAVE_ONLY_SYSCFG_PROFILES)
 
+CC=@CC@
 CFLAGS=@CFLAGS@
 
 ifdef NO_EXTRA_CFLAGS
diff --git a/config.sh.in b/config.sh.in
index 155f2158e..0a91c68f2 100644
--- a/config.sh.in
+++ b/config.sh.in
@@ -4,4 +4,5 @@
 # shellcheck disable=SC2034
 
 NAME="@PACKAGE_NAME@"
+TARNAME="@PACKAGE_TARNAME@"
 VERSION="@PACKAGE_VERSION@"
diff --git a/mkdeb.sh b/mkdeb.sh
index a98261ba6..5f65e80b2 100755
--- a/mkdeb.sh
+++ b/mkdeb.sh
@@ -14,8 +14,8 @@ EXTRA_VERSION=$1
 
 test "$#" -gt 0 && shift
 
-CODE_ARCHIVE="$NAME-$VERSION.tar.xz"
-CODE_DIR="$NAME-$VERSION"
+CODE_ARCHIVE="$TARNAME-$VERSION.tar.xz"
+CODE_DIR="$TARNAME-$VERSION"
 INSTALL_DIR="${INSTALL_DIR}${CODE_DIR}/debian"
 DEBIAN_CTRL_DIR="${DEBIAN_CTRL_DIR}${CODE_DIR}/debian/DEBIAN"