mkdeb.sh.in: move configure-time vars into new config.sh.in

For better organization and so that they can be used by other shell
scripts by just sourcing config.sh.

6 files changed, 13 insertions, 4 deletions

diff --git a/.gitignore b/.gitignore
index d5716f157..70dba09b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@ Makefile
 autom4te.cache/
 config.log
 config.mk
+config.sh
 config.status
 firejail-*.tar.xz
 firejail-login.5
diff --git a/Makefile.in b/Makefile.in
index 42ef2070f..4d9983672 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -85,7 +85,7 @@ distclean: clean
                 $(MAKE) -C $$dir distclean; \
         done
         $(MAKE) -C test distclean
-        rm -fr Makefile autom4te.cache config.log config.mk config.status src/common.mk mkdeb.sh
+        rm -fr Makefile autom4te.cache config.log config.mk config.sh config.status src/common.mk mkdeb.sh
 
 realinstall:
         # firejail executable
@@ -193,6 +193,7 @@ Makefile.in \
 README \
 RELNOTES \
 config.mk.in \
+config.sh.in \
 configure \
 configure.ac \
 contrib \
@@ -208,11 +209,13 @@ src
 DISTFILES_TEST = test/Makefile.in test/apps test/apps-x11 test/apps-x11-xorg test/root test/private-lib test/fnetfilter test/fcopy test/environment test/profiles test/utils test/compile test/filters test/network test/fs test/sysutils test/chroot
 
 dist:
+        mv config.sh config.sh.old
         mv config.status config.status.old
         mv mkdeb.sh mkdeb.sh.old
         make distclean
         mv mkdeb.sh.old mkdeb.sh
         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)
diff --git a/config.sh.in b/config.sh.in
new file mode 100644
index 000000000..28251b3d5
--- /dev/null
+++ b/config.sh.in
@@ -0,0 +1,2 @@
+NAME=@PACKAGE_NAME@
+VERSION=@PACKAGE_VERSION@
diff --git a/configure b/configure
index 0b83a9ab0..2dffacc32 100755
--- a/configure
+++ b/configure
@@ -4087,7 +4087,7 @@ fi
 
 ac_config_files="$ac_config_files mkdeb.sh"
 
-ac_config_files="$ac_config_files Makefile config.mk src/bash_completion/Makefile src/common.mk src/fbuilder/Makefile src/fcopy/Makefile src/fids/Makefile src/firecfg/Makefile src/firejail/Makefile src/firemon/Makefile src/fldd/Makefile src/fnet/Makefile src/fnetfilter/Makefile src/fnettrace-dns/Makefile src/fnettrace-sni/Makefile src/fnettrace/Makefile src/fsec-optimize/Makefile src/fsec-print/Makefile src/fseccomp/Makefile src/ftee/Makefile src/fzenity/Makefile src/jailcheck/Makefile src/lib/Makefile src/libpostexecseccomp/Makefile src/libtrace/Makefile src/libtracelog/Makefile src/man/Makefile src/profstats/Makefile src/zsh_completion/Makefile test/Makefile"
+ac_config_files="$ac_config_files Makefile config.mk config.sh src/bash_completion/Makefile src/common.mk src/fbuilder/Makefile src/fcopy/Makefile src/fids/Makefile src/firecfg/Makefile src/firejail/Makefile src/firemon/Makefile src/fldd/Makefile src/fnet/Makefile src/fnetfilter/Makefile src/fnettrace-dns/Makefile src/fnettrace-sni/Makefile src/fnettrace/Makefile src/fsec-optimize/Makefile src/fsec-print/Makefile src/fseccomp/Makefile src/ftee/Makefile src/fzenity/Makefile src/jailcheck/Makefile src/lib/Makefile src/libpostexecseccomp/Makefile src/libtrace/Makefile src/libtracelog/Makefile src/man/Makefile src/profstats/Makefile src/zsh_completion/Makefile test/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -4798,6 +4798,7 @@ do
     "mkdeb.sh") CONFIG_FILES="$CONFIG_FILES mkdeb.sh" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "config.mk") CONFIG_FILES="$CONFIG_FILES config.mk" ;;
+    "config.sh") CONFIG_FILES="$CONFIG_FILES config.sh" ;;
     "src/bash_completion/Makefile") CONFIG_FILES="$CONFIG_FILES src/bash_completion/Makefile" ;;
     "src/common.mk") CONFIG_FILES="$CONFIG_FILES src/common.mk" ;;
     "src/fbuilder/Makefile") CONFIG_FILES="$CONFIG_FILES src/fbuilder/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index d61f87b97..cb20589cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -286,6 +286,7 @@ AC_CONFIG_FILES([mkdeb.sh], [chmod +x mkdeb.sh])
 AC_CONFIG_FILES([
 Makefile
 config.mk
+config.sh
 src/bash_completion/Makefile
 src/common.mk
 src/fbuilder/Makefile
diff --git a/mkdeb.sh.in b/mkdeb.sh.in
index 79f8d748c..a98261ba6 100755
--- a/mkdeb.sh.in
+++ b/mkdeb.sh.in
@@ -7,8 +7,9 @@
 # a code archive should already be available
 
 set -e
-NAME=@PACKAGE_NAME@
-VERSION=@PACKAGE_VERSION@
+
+. "$(dirname "$0")/config.sh"
+
 EXTRA_VERSION=$1
 
 test "$#" -gt 0 && shift