diff options
author | Kelvin M. Klann <kmk3.code@protonmail.com> | 2024-05-18 04:09:39 -0300 |
---|---|---|
committer | Kelvin M. Klann <kmk3.code@protonmail.com> | 2024-05-24 10:10:41 -0300 |
commit | 5e2f4c36629ede58c3bb42111fdb3355c1317bcd (patch) | |
tree | 8123099fac07a0c7653fc0086a6980f9eeae6d7e | |
parent | profiles: yelp: add Firefox URL open support (#6349) (diff) | |
download | firejail-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/Makefile | 2 | ||||
-rw-r--r-- | src/man/Makefile | 2 | ||||
-rw-r--r-- | src/prog.mk | 2 | ||||
-rw-r--r-- | src/so.mk | 2 | ||||
-rw-r--r-- | src/zsh_completion/Makefile | 2 |
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 @@ | |||
2 | ROOT = ../.. | 2 | ROOT = ../.. |
3 | -include $(ROOT)/config.mk | 3 | -include $(ROOT)/config.mk |
4 | 4 | ||
5 | GAWK ?= gawk | ||
6 | |||
5 | .PHONY: all | 7 | .PHONY: all |
6 | all: firejail.bash_completion | 8 | all: 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 @@ | |||
2 | ROOT = ../.. | 2 | ROOT = ../.. |
3 | -include $(ROOT)/config.mk | 3 | -include $(ROOT)/config.mk |
4 | 4 | ||
5 | GAWK ?= gawk | ||
6 | |||
5 | MOD_DIR := $(ROOT)/src/man | 7 | MOD_DIR := $(ROOT)/src/man |
6 | MANPAGES_IN := $(sort $(wildcard $(MOD_DIR)/*.in)) | 8 | MANPAGES_IN := $(sort $(wildcard $(MOD_DIR)/*.in)) |
7 | MANPAGES_GZ := $(MANPAGES_IN:.in=.gz) | 9 | MANPAGES_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 | ||
8 | CC ?= cc | ||
9 | |||
8 | HDRS := | 10 | HDRS := |
9 | SRCS := $(sort $(wildcard $(MOD_DIR)/*.c)) | 11 | SRCS := $(sort $(wildcard $(MOD_DIR)/*.c)) |
10 | OBJS := $(SRCS:.c=.o) | 12 | OBJS := $(SRCS:.c=.o) |
@@ -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 | ||
8 | CC ?= cc | ||
9 | |||
8 | HDRS := | 10 | HDRS := |
9 | SRCS := $(sort $(wildcard $(MOD_DIR)/*.c)) | 11 | SRCS := $(sort $(wildcard $(MOD_DIR)/*.c)) |
10 | OBJS := $(SRCS:.c=.o) | 12 | OBJS := $(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 @@ | |||
2 | ROOT = ../.. | 2 | ROOT = ../.. |
3 | -include $(ROOT)/config.mk | 3 | -include $(ROOT)/config.mk |
4 | 4 | ||
5 | GAWK ?= gawk | ||
6 | |||
5 | .PHONY: all | 7 | .PHONY: all |
6 | all: _firejail | 8 | all: _firejail |
7 | 9 | ||