aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2022-05-04 21:16:14 -0300
committerLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2022-06-12 16:08:47 -0300
commit4e8244fb81e17840cf1e0c2410683992c25867a9 (patch)
tree4ac5c0a92292e607bb3b12afa06e6f9bf9da8e69 /configure
parentmakefiles: define root dir and include relative to it (diff)
downloadfirejail-4e8244fb81e17840cf1e0c2410683992c25867a9.tar.gz
firejail-4e8244fb81e17840cf1e0c2410683992c25867a9.tar.zst
firejail-4e8244fb81e17840cf1e0c2410683992c25867a9.zip
makefiles: deduplicate configure-time vars into new config.mk.in
Currently, the configure-time variables (that is, the ones that assign to placeholders, such as "@HAVE_MAN@", which are set/replaced at configure-time) are defined on multiple files (such as on Makefile.in and on common.mk.in). To avoid duplication, centralize these variables on a single file (config.mk.in) and replace all of the other definitions of them with an include of config.mk.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure3
1 files changed, 2 insertions, 1 deletions
diff --git a/configure b/configure
index c4d250c33..0b83a9ab0 100755
--- a/configure
+++ b/configure
@@ -4087,7 +4087,7 @@ fi
4087 4087
4088ac_config_files="$ac_config_files mkdeb.sh" 4088ac_config_files="$ac_config_files mkdeb.sh"
4089 4089
4090ac_config_files="$ac_config_files Makefile 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" 4090ac_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"
4091 4091
4092cat >confcache <<\_ACEOF 4092cat >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
@@ -4797,6 +4797,7 @@ do
4797 case $ac_config_target in 4797 case $ac_config_target in
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 "src/bash_completion/Makefile") CONFIG_FILES="$CONFIG_FILES src/bash_completion/Makefile" ;; 4801 "src/bash_completion/Makefile") CONFIG_FILES="$CONFIG_FILES src/bash_completion/Makefile" ;;
4801 "src/common.mk") CONFIG_FILES="$CONFIG_FILES src/common.mk" ;; 4802 "src/common.mk") CONFIG_FILES="$CONFIG_FILES src/common.mk" ;;
4802 "src/fbuilder/Makefile") CONFIG_FILES="$CONFIG_FILES src/fbuilder/Makefile" ;; 4803 "src/fbuilder/Makefile") CONFIG_FILES="$CONFIG_FILES src/fbuilder/Makefile" ;;