diff options
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | Makefile.in | 5 | ||||
-rw-r--r-- | config.sh.in | 2 | ||||
-rwxr-xr-x | configure | 3 | ||||
-rw-r--r-- | configure.ac | 1 | ||||
-rwxr-xr-x | mkdeb.sh.in | 5 |
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 | |||
14 | autom4te.cache/ | 14 | autom4te.cache/ |
15 | config.log | 15 | config.log |
16 | config.mk | 16 | config.mk |
17 | config.sh | ||
17 | config.status | 18 | config.status |
18 | firejail-*.tar.xz | 19 | firejail-*.tar.xz |
19 | firejail-login.5 | 20 | 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 | |||
85 | $(MAKE) -C $$dir distclean; \ | 85 | $(MAKE) -C $$dir distclean; \ |
86 | done | 86 | done |
87 | $(MAKE) -C test distclean | 87 | $(MAKE) -C test distclean |
88 | rm -fr Makefile autom4te.cache config.log config.mk config.status src/common.mk mkdeb.sh | 88 | rm -fr Makefile autom4te.cache config.log config.mk config.sh config.status src/common.mk mkdeb.sh |
89 | 89 | ||
90 | realinstall: | 90 | realinstall: |
91 | # firejail executable | 91 | # firejail executable |
@@ -193,6 +193,7 @@ Makefile.in \ | |||
193 | README \ | 193 | README \ |
194 | RELNOTES \ | 194 | RELNOTES \ |
195 | config.mk.in \ | 195 | config.mk.in \ |
196 | config.sh.in \ | ||
196 | configure \ | 197 | configure \ |
197 | configure.ac \ | 198 | configure.ac \ |
198 | contrib \ | 199 | contrib \ |
@@ -208,11 +209,13 @@ src | |||
208 | 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 | 209 | 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 |
209 | 210 | ||
210 | dist: | 211 | dist: |
212 | mv config.sh config.sh.old | ||
211 | mv config.status config.status.old | 213 | mv config.status config.status.old |
212 | mv mkdeb.sh mkdeb.sh.old | 214 | mv mkdeb.sh mkdeb.sh.old |
213 | make distclean | 215 | make distclean |
214 | mv mkdeb.sh.old mkdeb.sh | 216 | mv mkdeb.sh.old mkdeb.sh |
215 | mv config.status.old config.status | 217 | mv config.status.old config.status |
218 | mv config.sh.old config.sh | ||
216 | rm -fr $(NAME)-$(VERSION) $(NAME)-$(VERSION).tar.xz | 219 | rm -fr $(NAME)-$(VERSION) $(NAME)-$(VERSION).tar.xz |
217 | mkdir -p $(NAME)-$(VERSION)/test | 220 | mkdir -p $(NAME)-$(VERSION)/test |
218 | cp -a $(DISTFILES) $(NAME)-$(VERSION) | 221 | 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 @@ | |||
1 | NAME=@PACKAGE_NAME@ | ||
2 | VERSION=@PACKAGE_VERSION@ | ||
@@ -4087,7 +4087,7 @@ fi | |||
4087 | 4087 | ||
4088 | ac_config_files="$ac_config_files mkdeb.sh" | 4088 | ac_config_files="$ac_config_files mkdeb.sh" |
4089 | 4089 | ||
4090 | 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" | 4090 | 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" |
4091 | 4091 | ||
4092 | cat >confcache <<\_ACEOF | 4092 | cat >confcache <<\_ACEOF |
4093 | # This file is a shell script that caches the results of configure | 4093 | # This file is a shell script that caches the results of configure |
@@ -4798,6 +4798,7 @@ do | |||
4798 | "mkdeb.sh") CONFIG_FILES="$CONFIG_FILES mkdeb.sh" ;; | 4798 | "mkdeb.sh") CONFIG_FILES="$CONFIG_FILES mkdeb.sh" ;; |
4799 | "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; | 4799 | "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; |
4800 | "config.mk") CONFIG_FILES="$CONFIG_FILES config.mk" ;; | 4800 | "config.mk") CONFIG_FILES="$CONFIG_FILES config.mk" ;; |
4801 | "config.sh") CONFIG_FILES="$CONFIG_FILES config.sh" ;; | ||
4801 | "src/bash_completion/Makefile") CONFIG_FILES="$CONFIG_FILES src/bash_completion/Makefile" ;; | 4802 | "src/bash_completion/Makefile") CONFIG_FILES="$CONFIG_FILES src/bash_completion/Makefile" ;; |
4802 | "src/common.mk") CONFIG_FILES="$CONFIG_FILES src/common.mk" ;; | 4803 | "src/common.mk") CONFIG_FILES="$CONFIG_FILES src/common.mk" ;; |
4803 | "src/fbuilder/Makefile") CONFIG_FILES="$CONFIG_FILES src/fbuilder/Makefile" ;; | 4804 | "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]) | |||
286 | AC_CONFIG_FILES([ | 286 | AC_CONFIG_FILES([ |
287 | Makefile | 287 | Makefile |
288 | config.mk | 288 | config.mk |
289 | config.sh | ||
289 | src/bash_completion/Makefile | 290 | src/bash_completion/Makefile |
290 | src/common.mk | 291 | src/common.mk |
291 | src/fbuilder/Makefile | 292 | 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 @@ | |||
7 | # a code archive should already be available | 7 | # a code archive should already be available |
8 | 8 | ||
9 | set -e | 9 | set -e |
10 | NAME=@PACKAGE_NAME@ | 10 | |
11 | VERSION=@PACKAGE_VERSION@ | 11 | . "$(dirname "$0")/config.sh" |
12 | |||
12 | EXTRA_VERSION=$1 | 13 | EXTRA_VERSION=$1 |
13 | 14 | ||
14 | test "$#" -gt 0 && shift | 15 | test "$#" -gt 0 && shift |