aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2024-05-18 04:09:39 -0300
committerLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2024-05-24 10:10:41 -0300
commit5e2f4c36629ede58c3bb42111fdb3355c1317bcd (patch)
tree8123099fac07a0c7653fc0086a6980f9eeae6d7e
parentprofiles: yelp: add Firefox URL open support (#6349) (diff)
downloadfirejail-5e2f4c36629ede58c3bb42111fdb3355c1317bcd.tar.gz
firejail-5e2f4c36629ede58c3bb42111fdb3355c1317bcd.tar.zst
firejail-5e2f4c36629ede58c3bb42111fdb3355c1317bcd.zip
build: define CC/GAWK if undefined
Just in case the value is not defined in config.mk and `make` is first executed from another directory (such as in src/man) instead of the root directory. This amends commit 93d623fdf ("build: allow overriding certain tools", 2024-02-23) / PR #6222.
-rw-r--r--src/bash_completion/Makefile2
-rw-r--r--src/man/Makefile2
-rw-r--r--src/prog.mk2
-rw-r--r--src/so.mk2
-rw-r--r--src/zsh_completion/Makefile2
5 files changed, 10 insertions, 0 deletions
diff --git a/src/bash_completion/Makefile b/src/bash_completion/Makefile
index c7ef6afc6..91a1be0bc 100644
--- a/src/bash_completion/Makefile
+++ b/src/bash_completion/Makefile
@@ -2,6 +2,8 @@
2ROOT = ../.. 2ROOT = ../..
3-include $(ROOT)/config.mk 3-include $(ROOT)/config.mk
4 4
5GAWK ?= gawk
6
5.PHONY: all 7.PHONY: all
6all: firejail.bash_completion 8all: firejail.bash_completion
7 9
diff --git a/src/man/Makefile b/src/man/Makefile
index 1c1fd49a5..682aadaad 100644
--- a/src/man/Makefile
+++ b/src/man/Makefile
@@ -2,6 +2,8 @@
2ROOT = ../.. 2ROOT = ../..
3-include $(ROOT)/config.mk 3-include $(ROOT)/config.mk
4 4
5GAWK ?= gawk
6
5MOD_DIR := $(ROOT)/src/man 7MOD_DIR := $(ROOT)/src/man
6MANPAGES_IN := $(sort $(wildcard $(MOD_DIR)/*.in)) 8MANPAGES_IN := $(sort $(wildcard $(MOD_DIR)/*.in))
7MANPAGES_GZ := $(MANPAGES_IN:.in=.gz) 9MANPAGES_GZ := $(MANPAGES_IN:.in=.gz)
diff --git a/src/prog.mk b/src/prog.mk
index a639e87fc..4f9309d8c 100644
--- a/src/prog.mk
+++ b/src/prog.mk
@@ -5,6 +5,8 @@
5# The includer should probably define PROG and TARGET and may also want to 5# The includer should probably define PROG and TARGET and may also want to
6# define EXTRA_OBJS and extend CLEANFILES. 6# define EXTRA_OBJS and extend CLEANFILES.
7 7
8CC ?= cc
9
8HDRS := 10HDRS :=
9SRCS := $(sort $(wildcard $(MOD_DIR)/*.c)) 11SRCS := $(sort $(wildcard $(MOD_DIR)/*.c))
10OBJS := $(SRCS:.c=.o) 12OBJS := $(SRCS:.c=.o)
diff --git a/src/so.mk b/src/so.mk
index ac76ffc30..cb1f08b08 100644
--- a/src/so.mk
+++ b/src/so.mk
@@ -5,6 +5,8 @@
5# The includer should probably define SO and TARGET and may also want to define 5# The includer should probably define SO and TARGET and may also want to define
6# EXTRA_OBJS and extend CLEANFILES. 6# EXTRA_OBJS and extend CLEANFILES.
7 7
8CC ?= cc
9
8HDRS := 10HDRS :=
9SRCS := $(sort $(wildcard $(MOD_DIR)/*.c)) 11SRCS := $(sort $(wildcard $(MOD_DIR)/*.c))
10OBJS := $(SRCS:.c=.o) 12OBJS := $(SRCS:.c=.o)
diff --git a/src/zsh_completion/Makefile b/src/zsh_completion/Makefile
index e964d39ec..80c8b1608 100644
--- a/src/zsh_completion/Makefile
+++ b/src/zsh_completion/Makefile
@@ -2,6 +2,8 @@
2ROOT = ../.. 2ROOT = ../..
3-include $(ROOT)/config.mk 3-include $(ROOT)/config.mk
4 4
5GAWK ?= gawk
6
5.PHONY: all 7.PHONY: all
6all: _firejail 8all: _firejail
7 9