From: Alejandro Colomar Date: Sun, 16 Feb 2025 15:26:52 +0000 (+0100) Subject: share/mk/: Use ifndef and := instead of ?= X-Git-Tag: man-pages-6.12~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=afbd0973b226a2b19a855bee76efe0eb0089384e;p=thirdparty%2Fman-pages.git share/mk/: Use ifndef and := instead of ?= The semantics of '?=' are similar to those of '=', but we need simple assignment as if ':=', so we can't use '?='. In the future, we'll be able to use '?:='. For now, let's use ifndef. Fixes: 0d69e51cd4b8 (2025-02-10; "share/mk/: Use ?= assignments for user-facing variables") Link: Reported-by: Brian Inglis Signed-off-by: Alejandro Colomar --- diff --git a/GNUmakefile b/GNUmakefile index 85ff1b77b..09a7d7843 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -18,7 +18,9 @@ MAKEFLAGS += --no-builtin-variables MAKEFLAGS += --warn-undefined-variables -srcdir ?= . +ifndef srcdir +srcdir := . +endif MAKEFILEDIR := $(CURDIR)/share/mk diff --git a/share/mk/configure/build-depends/binutils/ld.mk b/share/mk/configure/build-depends/binutils/ld.mk index dd73845bf..11e8684c1 100644 --- a/share/mk/configure/build-depends/binutils/ld.mk +++ b/share/mk/configure/build-depends/binutils/ld.mk @@ -1,4 +1,4 @@ -# Copyright 2022-2024, Alejandro Colomar +# Copyright 2022-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -13,7 +13,9 @@ include $(MAKEFILEDIR)/configure/build-depends/pkgconf/pkgconf.mk include $(MAKEFILEDIR)/configure/verbose.mk -LD ?= $(CC) $(CFLAGS_) $(CPPFLAGS_) +ifndef LD +LD := $(CC) $(CFLAGS_) $(CPPFLAGS_) +endif LD_HAS_FUSE_LINKER_PLUGIN := \ @@ -37,15 +39,23 @@ ifeq ($(LD_HAS_FUSE_LINKER_PLUGIN),yes) DEFAULT_LDFLAGS += -fuse-linker-plugin endif -LDFLAGS ?= -LDFLAGS_ ?= $(DEFAULT_LDFLAGS) $(LDFLAGS) +ifndef LDFLAGS +LDFLAGS := +endif +ifndef LDFLAGS_ +LDFLAGS_ := $(DEFAULT_LDFLAGS) $(LDFLAGS) +endif DEFAULT_LDLIBS := \ -lc \ $(shell $(PKGCONF_CMD) --libs-only-l $(PKGCONF_LIBS) $(HIDE_ERR)) -LDLIBS ?= -LDLIBS_ ?= $(DEFAULT_LDLIBS) $(LDLIBS) +ifndef LDLIBS +LDLIBS := +endif +ifndef LDLIBS_ +LDLIBS_ := $(DEFAULT_LDLIBS) $(LDLIBS) +endif endif # include guard diff --git a/share/mk/configure/build-depends/bsdextrautils/col.mk b/share/mk/configure/build-depends/bsdextrautils/col.mk index ea65dabc9..9e42e4976 100644 --- a/share/mk/configure/build-depends/bsdextrautils/col.mk +++ b/share/mk/configure/build-depends/bsdextrautils/col.mk @@ -1,4 +1,4 @@ -# Copyright 2024, Alejandro Colomar +# Copyright 2024-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -10,9 +10,15 @@ DEFAULT_COLFLAGS := \ -b \ -p \ -x -COLFLAGS ?= -COLFLAGS_ ?= $(DEFAULT_COLFLAGS) $(COLFLAGS) -COL ?= col +ifndef COLFLAGS +COLFLAGS := +endif +ifndef COLFLAGS_ +COLFLAGS_ := $(DEFAULT_COLFLAGS) $(COLFLAGS) +endif +ifndef COL +COL := col +endif endif # include guard diff --git a/share/mk/configure/build-depends/bzip2/bzip2.mk b/share/mk/configure/build-depends/bzip2/bzip2.mk index db516d8f0..89c3d6d06 100644 --- a/share/mk/configure/build-depends/bzip2/bzip2.mk +++ b/share/mk/configure/build-depends/bzip2/bzip2.mk @@ -1,4 +1,4 @@ -# Copyright 2023-2024, Alejandro Colomar +# Copyright 2023-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -7,9 +7,15 @@ MAKEFILE_CONFIGURE_BUILD_DEPENDS_BZIP2_BZIP2_INCLUDED := 1 DEFAULT_BZIP2FLAGS := -BZIP2FLAGS ?= -BZIP2FLAGS_ ?= $(DEFAULT_BZIP2FLAGS) $(BZIP2FLAGS) -BZIP2 ?= bzip2 +ifndef BZIP2FLAGS +BZIP2FLAGS := +endif +ifndef BZIP2FLAGS_ +BZIP2FLAGS_ := $(DEFAULT_BZIP2FLAGS) $(BZIP2FLAGS) +endif +ifndef BZIP2 +BZIP2 := bzip2 +endif endif # include guard diff --git a/share/mk/configure/build-depends/checkpatch/checkpatch.mk b/share/mk/configure/build-depends/checkpatch/checkpatch.mk index de7bb7d9b..6ee1159f1 100644 --- a/share/mk/configure/build-depends/checkpatch/checkpatch.mk +++ b/share/mk/configure/build-depends/checkpatch/checkpatch.mk @@ -1,4 +1,4 @@ -# Copyright 2022-2024, Alejandro Colomar +# Copyright 2022-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -11,9 +11,15 @@ include $(MAKEFILEDIR)/configure/directory_variables/src.mk CHECKPATCH_CONF := $(SYSCONFDIR)/checkpatch/checkpatch.conf DEFAULT_CHECKPATCHFLAGS := -CHECKPATCHFLAGS ?= -CHECKPATCHFLAGS_ ?= $(DEFAULT_CHECKPATCHFLAGS) $(CHECKPATCHFLAGS) -CHECKPATCH ?= checkpatch +ifndef CHECKPATCHFLAGS +CHECKPATCHFLAGS := +endif +ifndef CHECKPATCHFLAGS_ +CHECKPATCHFLAGS_ := $(DEFAULT_CHECKPATCHFLAGS) $(CHECKPATCHFLAGS) +endif +ifndef CHECKPATCH +CHECKPATCH := checkpatch +endif endif # include guard diff --git a/share/mk/configure/build-depends/clang-tidy/clang-tidy.mk b/share/mk/configure/build-depends/clang-tidy/clang-tidy.mk index 24f8b12dc..0faa5673b 100644 --- a/share/mk/configure/build-depends/clang-tidy/clang-tidy.mk +++ b/share/mk/configure/build-depends/clang-tidy/clang-tidy.mk @@ -1,4 +1,4 @@ -# Copyright 2022-2024, Alejandro Colomar +# Copyright 2022-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -14,9 +14,15 @@ DEFAULT_CLANG_TIDYFLAGS := \ --config-file=$(CLANG_TIDY_CONF) \ --quiet \ --use-color -CLANG_TIDYFLAGS ?= -CLANG_TIDYFLAGS_ ?= $(DEFAULT_CLANG_TIDYFLAGS) $(CLANG_TIDYFLAGS) -CLANG_TIDY ?= clang-tidy +ifndef CLANG_TIDYFLAGS +CLANG_TIDYFLAGS := +endif +ifndef CLANG_TIDYFLAGS_ +CLANG_TIDYFLAGS_ := $(DEFAULT_CLANG_TIDYFLAGS) $(CLANG_TIDYFLAGS) +endif +ifndef CLANG_TIDY +CLANG_TIDY := clang-tidy +endif endif # include guard diff --git a/share/mk/configure/build-depends/clang/clang.mk b/share/mk/configure/build-depends/clang/clang.mk index d95c7e080..9e84043c8 100644 --- a/share/mk/configure/build-depends/clang/clang.mk +++ b/share/mk/configure/build-depends/clang/clang.mk @@ -1,4 +1,4 @@ -# Copyright 2024, Alejandro Colomar +# Copyright 2024-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -12,8 +12,12 @@ include $(MAKEFILEDIR)/configure/build-depends/gcc/cc.mk DEFAULT_CLANGFLAGS := \ $(COMMON_CFLAGS) \ $(CLANG_CFLAGS) -CLANGFLAGS ?= -CLANGFLAGS_ ?= $(DEFAULT_CLANGFLAGS) $(CLANGFLAGS) +ifndef CLANGFLAGS +CLANGFLAGS := +endif +ifndef CLANGFLAGS_ +CLANGFLAGS_ := $(DEFAULT_CLANGFLAGS) $(CLANGFLAGS) +endif endif # include guard diff --git a/share/mk/configure/build-depends/coreutils/cat.mk b/share/mk/configure/build-depends/coreutils/cat.mk index 45bb88d82..2a16370a2 100644 --- a/share/mk/configure/build-depends/coreutils/cat.mk +++ b/share/mk/configure/build-depends/coreutils/cat.mk @@ -1,4 +1,4 @@ -# Copyright 2022-2024, Alejandro Colomar +# Copyright 2022-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -6,7 +6,9 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_CAT_INCLUDED MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_CAT_INCLUDED := 1 -CAT ?= cat +ifndef CAT +CAT := cat +endif endif # include guard diff --git a/share/mk/configure/build-depends/coreutils/cp.mk b/share/mk/configure/build-depends/coreutils/cp.mk index 1ae81f152..c88518315 100644 --- a/share/mk/configure/build-depends/coreutils/cp.mk +++ b/share/mk/configure/build-depends/coreutils/cp.mk @@ -1,4 +1,4 @@ -# Copyright 2022-2024, Alejandro Colomar +# Copyright 2022-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -6,7 +6,9 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_CP_INCLUDED MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_CP_INCLUDED := 1 -CP ?= cp +ifndef CP +CP := cp +endif endif # include guard diff --git a/share/mk/configure/build-depends/coreutils/cut.mk b/share/mk/configure/build-depends/coreutils/cut.mk index 07e5dbe44..b60571126 100644 --- a/share/mk/configure/build-depends/coreutils/cut.mk +++ b/share/mk/configure/build-depends/coreutils/cut.mk @@ -1,4 +1,4 @@ -# Copyright 2022-2024, Alejandro Colomar +# Copyright 2022-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -6,7 +6,9 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_CUT_INCLUDED MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_CUT_INCLUDED := 1 -CUT ?= cut +ifndef CUT +CUT := cut +endif endif # include guard diff --git a/share/mk/configure/build-depends/coreutils/echo.mk b/share/mk/configure/build-depends/coreutils/echo.mk index 79b983837..bcedd1e88 100644 --- a/share/mk/configure/build-depends/coreutils/echo.mk +++ b/share/mk/configure/build-depends/coreutils/echo.mk @@ -1,4 +1,4 @@ -# Copyright 2022-2024, Alejandro Colomar +# Copyright 2022-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -6,7 +6,9 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_ECHO_INCLUDED MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_ECHO_INCLUDED := 1 -ECHO ?= echo +ifndef ECHO +ECHO := echo +endif endif # include guard diff --git a/share/mk/configure/build-depends/coreutils/expr.mk b/share/mk/configure/build-depends/coreutils/expr.mk index 19e196b6d..11f7123b5 100644 --- a/share/mk/configure/build-depends/coreutils/expr.mk +++ b/share/mk/configure/build-depends/coreutils/expr.mk @@ -1,4 +1,4 @@ -# Copyright 2022-2024, Alejandro Colomar +# Copyright 2022-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -6,7 +6,9 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_EXPR_INCLUDED MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_EXPR_INCLUDED := 1 -EXPR ?= expr +ifndef EXPR +EXPR := expr +endif endif # include guard diff --git a/share/mk/configure/build-depends/coreutils/head.mk b/share/mk/configure/build-depends/coreutils/head.mk index 5dac509a1..ad5517e90 100644 --- a/share/mk/configure/build-depends/coreutils/head.mk +++ b/share/mk/configure/build-depends/coreutils/head.mk @@ -1,4 +1,4 @@ -# Copyright 2022-2024, Alejandro Colomar +# Copyright 2022-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -6,7 +6,9 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_HEAD_INCLUDED MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_HEAD_INCLUDED := 1 -HEAD ?= head +ifndef HEAD +HEAD := head +endif endif # include guard diff --git a/share/mk/configure/build-depends/coreutils/install.mk b/share/mk/configure/build-depends/coreutils/install.mk index c9305fa35..8b38d4689 100644 --- a/share/mk/configure/build-depends/coreutils/install.mk +++ b/share/mk/configure/build-depends/coreutils/install.mk @@ -1,4 +1,4 @@ -# Copyright 2022-2024, Alejandro Colomar +# Copyright 2022-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -6,12 +6,20 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_INSTALL_INCLUDED MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_INSTALL_INCLUDED := 1 -INSTALL ?= install +ifndef INSTALL +INSTALL := install +endif -INSTALL_DATA ?= $(INSTALL) -m 644 -INSTALL_DIR ?= $(INSTALL) -m 755 -d -INSTALL_PROGRAM ?= $(INSTALL) -m 755 +ifndef INSTALL_DATA +INSTALL_DATA := $(INSTALL) -m 644 +endif +ifndef INSTALL_DIR +INSTALL_DIR := $(INSTALL) -m 755 -d +endif +ifndef INSTALL_PROGRAM +INSTALL_PROGRAM := $(INSTALL) -m 755 +endif endif # include guard diff --git a/share/mk/configure/build-depends/coreutils/ln.mk b/share/mk/configure/build-depends/coreutils/ln.mk index b029bcf02..7200a47c2 100644 --- a/share/mk/configure/build-depends/coreutils/ln.mk +++ b/share/mk/configure/build-depends/coreutils/ln.mk @@ -1,4 +1,4 @@ -# Copyright 2022-2024, Alejandro Colomar +# Copyright 2022-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -6,7 +6,9 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_LN_INCLUDED MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_LN_INCLUDED := 1 -LN ?= ln +ifndef LN +LN := ln +endif endif # include guard diff --git a/share/mk/configure/build-depends/coreutils/mkdir.mk b/share/mk/configure/build-depends/coreutils/mkdir.mk index 52f378252..7614ad0b3 100644 --- a/share/mk/configure/build-depends/coreutils/mkdir.mk +++ b/share/mk/configure/build-depends/coreutils/mkdir.mk @@ -1,4 +1,4 @@ -# Copyright 2022-2024, Alejandro Colomar +# Copyright 2022-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -6,7 +6,9 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_MKDIR_INCLUDED MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_MKDIR_INCLUDED := 1 -MKDIR ?= mkdir +ifndef MKDIR +MKDIR := mkdir +endif endif # include guard diff --git a/share/mk/configure/build-depends/coreutils/realpath.mk b/share/mk/configure/build-depends/coreutils/realpath.mk index 128ac5a95..afea3b7e7 100644 --- a/share/mk/configure/build-depends/coreutils/realpath.mk +++ b/share/mk/configure/build-depends/coreutils/realpath.mk @@ -1,4 +1,4 @@ -# Copyright 2022-2024, Alejandro Colomar +# Copyright 2022-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -6,7 +6,9 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_REALPATH_INCLUDED MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_REALPATH_INCLUDED := 1 -REALPATH ?= realpath +ifndef REALPATH +REALPATH := realpath +endif endif # include guard diff --git a/share/mk/configure/build-depends/coreutils/rm.mk b/share/mk/configure/build-depends/coreutils/rm.mk index ed0802de3..e66ce5d66 100644 --- a/share/mk/configure/build-depends/coreutils/rm.mk +++ b/share/mk/configure/build-depends/coreutils/rm.mk @@ -1,4 +1,4 @@ -# Copyright 2022-2024, Alejandro Colomar +# Copyright 2022-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -6,7 +6,9 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_RM_INCLUDED MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_RM_INCLUDED := 1 -RM ?= rm +ifndef RM +RM := rm +endif endif # include guard diff --git a/share/mk/configure/build-depends/coreutils/sort.mk b/share/mk/configure/build-depends/coreutils/sort.mk index 9a3313658..94e5b1f1d 100644 --- a/share/mk/configure/build-depends/coreutils/sort.mk +++ b/share/mk/configure/build-depends/coreutils/sort.mk @@ -1,4 +1,4 @@ -# Copyright 2022-2024, Alejandro Colomar +# Copyright 2022-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -6,7 +6,9 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_SORT_INCLUDED MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_SORT_INCLUDED := 1 -SORT ?= sort +ifndef SORT +SORT := sort +endif endif # include guard diff --git a/share/mk/configure/build-depends/coreutils/stat.mk b/share/mk/configure/build-depends/coreutils/stat.mk index 3acab1299..c5372047d 100644 --- a/share/mk/configure/build-depends/coreutils/stat.mk +++ b/share/mk/configure/build-depends/coreutils/stat.mk @@ -1,4 +1,4 @@ -# Copyright 2022-2024, Alejandro Colomar +# Copyright 2022-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -6,7 +6,9 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_STAT_INCLUDED MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_STAT_INCLUDED := 1 -STAT ?= stat +ifndef STAT +STAT := stat +endif endif # include guard diff --git a/share/mk/configure/build-depends/coreutils/tac.mk b/share/mk/configure/build-depends/coreutils/tac.mk index 01fe03146..2dbc44722 100644 --- a/share/mk/configure/build-depends/coreutils/tac.mk +++ b/share/mk/configure/build-depends/coreutils/tac.mk @@ -1,4 +1,4 @@ -# Copyright 2022-2024, Alejandro Colomar +# Copyright 2022-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -6,7 +6,9 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_TAC_INCLUDED MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_TAC_INCLUDED := 1 -TAC ?= tac +ifndef TAC +TAC := tac +endif endif # include guard diff --git a/share/mk/configure/build-depends/coreutils/tail.mk b/share/mk/configure/build-depends/coreutils/tail.mk index 146bd9ae2..519bf9923 100644 --- a/share/mk/configure/build-depends/coreutils/tail.mk +++ b/share/mk/configure/build-depends/coreutils/tail.mk @@ -1,4 +1,4 @@ -# Copyright 2022-2024, Alejandro Colomar +# Copyright 2022-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -6,7 +6,9 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_TAIL_INCLUDED MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_TAIL_INCLUDED := 1 -TAIL ?= tail +ifndef TAIL +TAIL := tail +endif endif # include guard diff --git a/share/mk/configure/build-depends/coreutils/test.mk b/share/mk/configure/build-depends/coreutils/test.mk index 64ac295f5..6eaa5ad4a 100644 --- a/share/mk/configure/build-depends/coreutils/test.mk +++ b/share/mk/configure/build-depends/coreutils/test.mk @@ -1,4 +1,4 @@ -# Copyright 2022-2024, Alejandro Colomar +# Copyright 2022-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -6,7 +6,9 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_TEST_INCLUDED MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_TEST_INCLUDED := 1 -TEST ?= test +ifndef TEST +TEST := test +endif endif # include guard diff --git a/share/mk/configure/build-depends/coreutils/touch.mk b/share/mk/configure/build-depends/coreutils/touch.mk index 1f04f69a7..ce462051a 100644 --- a/share/mk/configure/build-depends/coreutils/touch.mk +++ b/share/mk/configure/build-depends/coreutils/touch.mk @@ -1,4 +1,4 @@ -# Copyright 2022-2024, Alejandro Colomar +# Copyright 2022-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -6,7 +6,9 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_TOUCH_INCLUDED MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_TOUCH_INCLUDED := 1 -TOUCH ?= touch +ifndef TOUCH +TOUCH := touch +endif endif # include guard diff --git a/share/mk/configure/build-depends/coreutils/true.mk b/share/mk/configure/build-depends/coreutils/true.mk index 570a42444..068aa986d 100644 --- a/share/mk/configure/build-depends/coreutils/true.mk +++ b/share/mk/configure/build-depends/coreutils/true.mk @@ -1,4 +1,4 @@ -# Copyright 2022-2024, Alejandro Colomar +# Copyright 2022-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -6,7 +6,9 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_TRUE_INCLUDED MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_TRUE_INCLUDED := 1 -TRUE ?= true +ifndef TRUE +TRUE := true +endif endif # include guard diff --git a/share/mk/configure/build-depends/cpp/cpp.mk b/share/mk/configure/build-depends/cpp/cpp.mk index 65da77f84..ef12a848a 100644 --- a/share/mk/configure/build-depends/cpp/cpp.mk +++ b/share/mk/configure/build-depends/cpp/cpp.mk @@ -1,4 +1,4 @@ -# Copyright 2022-2024, Alejandro Colomar +# Copyright 2022-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -13,7 +13,9 @@ include $(MAKEFILEDIR)/configure/build-depends/pkgconf/pkgconf.mk include $(MAKEFILEDIR)/configure/verbose.mk -CPP ?= $(CC) $(CFLAGS_) -E +ifndef CPP +CPP := $(CC) $(CFLAGS_) -E +endif CPP_HAS_ALREADY_D_FORTIFY_SOURCE := \ @@ -30,8 +32,12 @@ DEFAULT_CPPFLAGS := \ ifeq ($(CPP_HAS_ALREADY_D_FORTIFY_SOURCE),no) DEFAULT_CPPFLAGS += -D_FORTIFY_SOURCE=2 endif -CPPFLAGS ?= -CPPFLAGS_ ?= $(DEFAULT_CPPFLAGS) $(CPPFLAGS) +ifndef CPPFLAGS +CPPFLAGS := +endif +ifndef CPPFLAGS_ +CPPFLAGS_ := $(DEFAULT_CPPFLAGS) $(CPPFLAGS) +endif endif # include guard diff --git a/share/mk/configure/build-depends/cppcheck/cppcheck.mk b/share/mk/configure/build-depends/cppcheck/cppcheck.mk index 6a613632e..a29fe2d31 100644 --- a/share/mk/configure/build-depends/cppcheck/cppcheck.mk +++ b/share/mk/configure/build-depends/cppcheck/cppcheck.mk @@ -1,4 +1,4 @@ -# Copyright 2022-2024, Alejandro Colomar +# Copyright 2022-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -17,9 +17,15 @@ DEFAULT_CPPCHECKFLAGS := \ --check-level=exhaustive \ --quiet \ --suppressions-list=$(CPPCHECK_SUPPRESS) -CPPCHECKFLAGS ?= -CPPCHECKFLAGS_ ?= $(DEFAULT_CPPCHECKFLAGS) $(CPPCHECKFLAGS) -CPPCHECK ?= cppcheck +ifndef CPPCHECKFLAGS +CPPCHECKFLAGS := +endif +ifndef CPPCHECKFLAGS_ +CPPCHECKFLAGS_ := $(DEFAULT_CPPCHECKFLAGS) $(CPPCHECKFLAGS) +endif +ifndef CPPCHECK +CPPCHECK := cppcheck +endif endif # include guard diff --git a/share/mk/configure/build-depends/cpplint/cpplint.mk b/share/mk/configure/build-depends/cpplint/cpplint.mk index 29a62786e..af4c7fb9b 100644 --- a/share/mk/configure/build-depends/cpplint/cpplint.mk +++ b/share/mk/configure/build-depends/cpplint/cpplint.mk @@ -1,4 +1,4 @@ -# Copyright 2022-2024, Alejandro Colomar +# Copyright 2022-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -11,9 +11,15 @@ include $(MAKEFILEDIR)/configure/directory_variables/src.mk CPPLINT_CONF := $(SYSCONFDIR)/cpplint/cpplint.cfg DEFAULT_CPPLINTFLAGS := -CPPLINTFLAGS ?= -CPPLINTFLAGS_ ?= $(DEFAULT_CPPLINTFLAGS) $(CPPLINTFLAGS) -CPPLINT ?= cpplint +ifndef CPPLINTFLAGS +CPPLINTFLAGS := +endif +ifndef CPPLINTFLAGS_ +CPPLINTFLAGS_ := $(DEFAULT_CPPLINTFLAGS) $(CPPLINTFLAGS) +endif +ifndef CPPLINT +CPPLINT := cpplint +endif endif # include guard diff --git a/share/mk/configure/build-depends/diffoscope/diffoscope.mk b/share/mk/configure/build-depends/diffoscope/diffoscope.mk index 1827f6c07..64242747c 100644 --- a/share/mk/configure/build-depends/diffoscope/diffoscope.mk +++ b/share/mk/configure/build-depends/diffoscope/diffoscope.mk @@ -1,4 +1,4 @@ -# Copyright 2024, Alejandro Colomar +# Copyright 2024-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -6,7 +6,9 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_DIFFOSCOPE_DIFFOSCOPE_INCLUDED MAKEFILE_CONFIGURE_BUILD_DEPENDS_DIFFOSCOPE_DIFFOSCOPE_INCLUDED := 1 -DIFFOSCOPE ?= diffoscope +ifndef DIFFOSCOPE +DIFFOSCOPE := diffoscope +endif endif # include guard diff --git a/share/mk/configure/build-depends/findutils/find.mk b/share/mk/configure/build-depends/findutils/find.mk index 00e985840..5493fb932 100644 --- a/share/mk/configure/build-depends/findutils/find.mk +++ b/share/mk/configure/build-depends/findutils/find.mk @@ -1,4 +1,4 @@ -# Copyright 2022-2024, Alejandro Colomar +# Copyright 2022-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -6,7 +6,9 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_FINDUTILS_FIND_INCLUDED MAKEFILE_CONFIGURE_BUILD_DEPENDS_FINDUTILS_FIND_INCLUDED := 1 -FIND ?= find +ifndef FIND +FIND := find +endif endif # include guard diff --git a/share/mk/configure/build-depends/findutils/xargs.mk b/share/mk/configure/build-depends/findutils/xargs.mk index 06d4b9f3d..f6a571478 100644 --- a/share/mk/configure/build-depends/findutils/xargs.mk +++ b/share/mk/configure/build-depends/findutils/xargs.mk @@ -1,4 +1,4 @@ -# Copyright 2022-2024, Alejandro Colomar +# Copyright 2022-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -6,7 +6,9 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_FINDUTILS_XARGS_INCLUDED MAKEFILE_CONFIGURE_BUILD_DEPENDS_FINDUTILS_XARGS_INCLUDED := 1 -XARGS ?= xargs +ifndef XARGS +XARGS := xargs +endif endif # include guard diff --git a/share/mk/configure/build-depends/fontforge/fontforge.mk b/share/mk/configure/build-depends/fontforge/fontforge.mk index cbf08b6f8..826068068 100644 --- a/share/mk/configure/build-depends/fontforge/fontforge.mk +++ b/share/mk/configure/build-depends/fontforge/fontforge.mk @@ -1,4 +1,4 @@ -# Copyright 2024, Alejandro Colomar +# Copyright 2024-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -7,9 +7,15 @@ MAKEFILE_CONFIGURE_BUILD_DEPENDS_FONTFORGE_FONTFORGE_INCLUDED := 1 DEFAULT_FONTFORGEFLAGS := -FONTFORGEFLAGS ?= -FONTFORGEFLAGS_ ?= $(DEFAULT_FONTFORGEFLAGS) $(FONTFORGEFLAGS) -FONTFORGE ?= fontforge +ifndef FONTFORGEFLAGS +FONTFORGEFLAGS := +endif +ifndef FONTFORGEFLAGS_ +FONTFORGEFLAGS_ := $(DEFAULT_FONTFORGEFLAGS) $(FONTFORGEFLAGS) +endif +ifndef FONTFORGE +FONTFORGE := fontforge +endif endif # include guard diff --git a/share/mk/configure/build-depends/gcc/cc.mk b/share/mk/configure/build-depends/gcc/cc.mk index c443cebfd..a83f054c5 100644 --- a/share/mk/configure/build-depends/gcc/cc.mk +++ b/share/mk/configure/build-depends/gcc/cc.mk @@ -1,4 +1,4 @@ -# Copyright 2024, Alejandro Colomar +# Copyright 2024-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -11,7 +11,9 @@ include $(MAKEFILEDIR)/configure/build-depends/grep/grep.mk include $(MAKEFILEDIR)/configure/build-depends/sed/sed.mk -CC ?= gcc +ifndef CC +CC := gcc +endif CC_VENDOR := \ @@ -61,8 +63,12 @@ else ifeq ($(CC_VENDOR),clang) DEFAULT_CFLAGS += $(CLANG_CFLAGS) endif -CFLAGS ?= -CFLAGS_ ?= $(DEFAULT_CFLAGS) $(CFLAGS) +ifndef CFLAGS +CFLAGS := +endif +ifndef CFLAGS_ +CFLAGS_ := $(DEFAULT_CFLAGS) $(CFLAGS) +endif endif # include guard diff --git a/share/mk/configure/build-depends/git/git.mk b/share/mk/configure/build-depends/git/git.mk index d0ed55250..22584bd86 100644 --- a/share/mk/configure/build-depends/git/git.mk +++ b/share/mk/configure/build-depends/git/git.mk @@ -1,4 +1,4 @@ -# Copyright 2022-2024, Alejandro Colomar +# Copyright 2022-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -6,7 +6,9 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_GIT_GIT_INCLUDED MAKEFILE_CONFIGURE_BUILD_DEPENDS_GIT_GIT_INCLUDED := 1 -GIT ?= git +ifndef GIT +GIT := git +endif endif # include guard diff --git a/share/mk/configure/build-depends/grep/grep.mk b/share/mk/configure/build-depends/grep/grep.mk index 875e1128a..5c077b44f 100644 --- a/share/mk/configure/build-depends/grep/grep.mk +++ b/share/mk/configure/build-depends/grep/grep.mk @@ -1,4 +1,4 @@ -# Copyright 2022-2024, Alejandro Colomar +# Copyright 2022-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -6,7 +6,9 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_GREP_GREP_INCLUDED MAKEFILE_CONFIGURE_BUILD_DEPENDS_GREP_GREP_INCLUDED := 1 -GREP ?= grep +ifndef GREP +GREP := grep +endif endif # include guard diff --git a/share/mk/configure/build-depends/groff-base/eqn.mk b/share/mk/configure/build-depends/groff-base/eqn.mk index 9fed05316..d6e612cff 100644 --- a/share/mk/configure/build-depends/groff-base/eqn.mk +++ b/share/mk/configure/build-depends/groff-base/eqn.mk @@ -1,4 +1,4 @@ -# Copyright 2024, Alejandro Colomar +# Copyright 2024-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -7,9 +7,15 @@ MAKEFILE_CONFIGURE_BUILD_DEPENDS_GROFF_BASE_EQN_INCLUDED := 1 DEFAULT_EQNFLAGS := -EQNFLAGS ?= -EQNFLAGS_ ?= $(DEFAULT_EQNFLAGS) $(EQNFLAGS) -EQN ?= eqn +ifndef EQNFLAGS +EQNFLAGS := +endif +ifndef EQNFLAGS_ +EQNFLAGS_ := $(DEFAULT_EQNFLAGS) $(EQNFLAGS) +endif +ifndef EQN +EQN := eqn +endif endif # include guard diff --git a/share/mk/configure/build-depends/groff-base/grops.mk b/share/mk/configure/build-depends/groff-base/grops.mk index 781751791..8837eaf2f 100644 --- a/share/mk/configure/build-depends/groff-base/grops.mk +++ b/share/mk/configure/build-depends/groff-base/grops.mk @@ -1,4 +1,4 @@ -# Copyright 2024, Alejandro Colomar +# Copyright 2024-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -7,9 +7,15 @@ MAKEFILE_CONFIGURE_BUILD_DEPENDS_GROFF_BASE_GROPS_INCLUDED := 1 DEFAULT_GROPSFLAGS := -GROPSFLAGS ?= -GROPSFLAGS_ ?= $(DEFAULT_GROPSFLAGS) $(GROPSFLAGS) -GROPS ?= grops +ifndef GROPSFLAGS +GROPSFLAGS := +endif +ifndef GROPSFLAGS_ +GROPSFLAGS_ := $(DEFAULT_GROPSFLAGS) $(GROPSFLAGS) +endif +ifndef GROPS +GROPS := grops +endif endif # include guard diff --git a/share/mk/configure/build-depends/groff-base/grotty.mk b/share/mk/configure/build-depends/groff-base/grotty.mk index 05055045e..8ece03c21 100644 --- a/share/mk/configure/build-depends/groff-base/grotty.mk +++ b/share/mk/configure/build-depends/groff-base/grotty.mk @@ -1,4 +1,4 @@ -# Copyright 2024, Alejandro Colomar +# Copyright 2024-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -7,9 +7,15 @@ MAKEFILE_CONFIGURE_BUILD_DEPENDS_GROFF_BASE_GROTTY_INCLUDED := 1 DEFAULT_GROTTYFLAGS := -c -GROTTYFLAGS ?= -GROTTYFLAGS_ ?= $(DEFAULT_GROTTYFLAGS) $(GROTTYFLAGS) -GROTTY ?= grotty +ifndef GROTTYFLAGS +GROTTYFLAGS := +endif +ifndef GROTTYFLAGS_ +GROTTYFLAGS_ := $(DEFAULT_GROTTYFLAGS) $(GROTTYFLAGS) +endif +ifndef GROTTY +GROTTY := grotty +endif endif # include guard diff --git a/share/mk/configure/build-depends/groff-base/nroff.mk b/share/mk/configure/build-depends/groff-base/nroff.mk index c1c70cec7..2a1703f26 100644 --- a/share/mk/configure/build-depends/groff-base/nroff.mk +++ b/share/mk/configure/build-depends/groff-base/nroff.mk @@ -1,4 +1,4 @@ -# Copyright 2024, Alejandro Colomar +# Copyright 2024-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -13,14 +13,20 @@ include $(MAKEFILEDIR)/configure/build-depends/libc-bin/locale.mk include $(MAKEFILEDIR)/configure/build-depends/man/man.mk -NROFF_CHECKSTYLE_LVL ?= 3 -NROFF_LINE_LENGTH ?= $(shell $(EXPR) $(MANWIDTH) - 2) -NROFF_OUT_DEVICE ?= \ +ifndef NROFF_CHECKSTYLE_LVL +NROFF_CHECKSTYLE_LVL := 3 +endif +ifndef NROFF_LINE_LENGTH +NROFF_LINE_LENGTH := $(shell $(EXPR) $(MANWIDTH) - 2) +endif +ifndef NROFF_OUT_DEVICE +NROFF_OUT_DEVICE := \ $(shell $(LOCALE) charmap \ | $(GREP) -i 'utf-*8' >/dev/null \ && $(ECHO) utf8 \ || $(ECHO) ascii \ ) +endif DEFAULT_NROFFFLAGS := \ @@ -28,8 +34,12 @@ DEFAULT_NROFFFLAGS := \ -rLL=$(NROFF_LINE_LENGTH)n \ -rCHECKSTYLE=$(NROFF_CHECKSTYLE_LVL) \ -ww -NROFFFLAGS ?= -NROFFFLAGS_ ?= $(DEFAULT_NROFFFLAGS) $(NROFFFLAGS) +ifndef NROFFFLAGS +NROFFFLAGS := +endif +ifndef NROFFFLAGS_ +NROFFFLAGS_ := $(DEFAULT_NROFFFLAGS) $(NROFFFLAGS) +endif endif # include guard diff --git a/share/mk/configure/build-depends/groff-base/pic.mk b/share/mk/configure/build-depends/groff-base/pic.mk index 3b10a66d7..4cf59ee33 100644 --- a/share/mk/configure/build-depends/groff-base/pic.mk +++ b/share/mk/configure/build-depends/groff-base/pic.mk @@ -1,4 +1,4 @@ -# Copyright 2024, Alejandro Colomar +# Copyright 2024-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -7,9 +7,15 @@ MAKEFILE_CONFIGURE_BUILD_DEPENDS_GROFF_BASE_PIC_INCLUDED := 1 DEFAULT_PICFLAGS := -PICFLAGS ?= -PICFLAGS_ ?= $(DEFAULT_PICFLAGS) $(PICFLAGS) -PIC ?= pic +ifndef PICFLAGS +PICFLAGS := +endif +ifndef PICFLAGS_ +PICFLAGS_ := $(DEFAULT_PICFLAGS) $(PICFLAGS) +endif +ifndef PIC +PIC := pic +endif endif # include guard diff --git a/share/mk/configure/build-depends/groff-base/preconv.mk b/share/mk/configure/build-depends/groff-base/preconv.mk index e1dfc95fc..9f0361f9c 100644 --- a/share/mk/configure/build-depends/groff-base/preconv.mk +++ b/share/mk/configure/build-depends/groff-base/preconv.mk @@ -1,4 +1,4 @@ -# Copyright 2024, Alejandro Colomar +# Copyright 2024-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -7,9 +7,15 @@ MAKEFILE_CONFIGURE_BUILD_DEPENDS_GROFF_BASE_PRECONV_INCLUDED := 1 DEFAULT_PRECONVFLAGS := -PRECONVFLAGS ?= -PRECONVFLAGS_ ?= $(DEFAULT_PRECONVFLAGS) $(PRECONVFLAGS) -PRECONV ?= preconv +ifndef PRECONVFLAGS +PRECONVFLAGS := +endif +ifndef PRECONVFLAGS_ +PRECONVFLAGS_ := $(DEFAULT_PRECONVFLAGS) $(PRECONVFLAGS) +endif +ifndef PRECONV +PRECONV := preconv +endif endif # include guard diff --git a/share/mk/configure/build-depends/groff-base/tbl.mk b/share/mk/configure/build-depends/groff-base/tbl.mk index f1e8889ba..461b05ae1 100644 --- a/share/mk/configure/build-depends/groff-base/tbl.mk +++ b/share/mk/configure/build-depends/groff-base/tbl.mk @@ -1,4 +1,4 @@ -# Copyright 2024, Alejandro Colomar +# Copyright 2024-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -6,7 +6,9 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_GROFF_BASE_TBL_INCLUDED MAKEFILE_CONFIGURE_BUILD_DEPENDS_GROFF_BASE_TBL_INCLUDED := 1 -TBL ?= tbl +ifndef TBL +TBL := tbl +endif endif # include guard diff --git a/share/mk/configure/build-depends/groff-base/troff.mk b/share/mk/configure/build-depends/groff-base/troff.mk index 533f9bbfc..e161b1b8b 100644 --- a/share/mk/configure/build-depends/groff-base/troff.mk +++ b/share/mk/configure/build-depends/groff-base/troff.mk @@ -1,4 +1,4 @@ -# Copyright 2024, Alejandro Colomar +# Copyright 2024-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -10,9 +10,15 @@ DEFAULT_TROFFFLAGS := \ -wbreak \ -rS12 \ -rU0 -TROFFFLAGS ?= -TROFFFLAGS_ ?= $(DEFAULT_TROFFFLAGS) $(TROFFFLAGS) -TROFF ?= troff +ifndef TROFFFLAGS +TROFFFLAGS := +endif +ifndef TROFFFLAGS_ +TROFFFLAGS_ := $(DEFAULT_TROFFFLAGS) $(TROFFFLAGS) +endif +ifndef TROFF +TROFF := troff +endif endif # include guard diff --git a/share/mk/configure/build-depends/groff/afmtodit.mk b/share/mk/configure/build-depends/groff/afmtodit.mk index 75cef85e9..0a7f0da36 100644 --- a/share/mk/configure/build-depends/groff/afmtodit.mk +++ b/share/mk/configure/build-depends/groff/afmtodit.mk @@ -1,4 +1,4 @@ -# Copyright 2024, Alejandro Colomar +# Copyright 2024-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -6,14 +6,24 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_GROFF_AFMTODIT_INCLUDED MAKEFILE_CONFIGURE_BUILD_DEPENDS_GROFF_AFMTODIT_INCLUDED := 1 -PDF_TEXT_ENC ?= /usr/share/groff/current/font/devpdf/enc/text.enc -PDF_TEXT_MAP ?= /usr/share/groff/current/font/devpdf/map/text.map +ifndef PDF_TEXT_ENC +PDF_TEXT_ENC := /usr/share/groff/current/font/devpdf/enc/text.enc +endif +ifndef PDF_TEXT_MAP +PDF_TEXT_MAP := /usr/share/groff/current/font/devpdf/map/text.map +endif DEFAULT_AFMTODITFLAGS := -AFMTODITFLAGS ?= -AFMTODITFLAGS_ ?= $(DEFAULT_AFMTODITFLAGS) $(AFMTODITFLAGS) -AFMTODIT ?= afmtodit +ifndef AFMTODITFLAGS +AFMTODITFLAGS := +endif +ifndef AFMTODITFLAGS_ +AFMTODITFLAGS_ := $(DEFAULT_AFMTODITFLAGS) $(AFMTODITFLAGS) +endif +ifndef AFMTODIT +AFMTODIT := afmtodit +endif endif # include guard diff --git a/share/mk/configure/build-depends/groff/gropdf.mk b/share/mk/configure/build-depends/groff/gropdf.mk index 61b19a561..aa451f82e 100644 --- a/share/mk/configure/build-depends/groff/gropdf.mk +++ b/share/mk/configure/build-depends/groff/gropdf.mk @@ -1,4 +1,4 @@ -# Copyright 2024, Alejandro Colomar +# Copyright 2024-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -7,9 +7,15 @@ MAKEFILE_CONFIGURE_BUILD_DEPENDS_GROFF_GROPDF_INCLUDED := 1 DEFAULT_GROPDFFLAGS := -GROPDFFLAGS ?= -GROPDFFLAGS_ ?= $(DEFAULT_GROPDFFLAGS) $(GROPDFFLAGS) -GROPDF ?= gropdf +ifndef GROPDFFLAGS +GROPDFFLAGS := +endif +ifndef GROPDFFLAGS_ +GROPDFFLAGS_ := $(DEFAULT_GROPDFFLAGS) $(GROPDFFLAGS) +endif +ifndef GROPDF +GROPDF := gropdf +endif endif # include guard diff --git a/share/mk/configure/build-depends/groff/pfbtops.mk b/share/mk/configure/build-depends/groff/pfbtops.mk index dd6982caf..8696e13cd 100644 --- a/share/mk/configure/build-depends/groff/pfbtops.mk +++ b/share/mk/configure/build-depends/groff/pfbtops.mk @@ -1,4 +1,4 @@ -# Copyright 2024, Alejandro Colomar +# Copyright 2024-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -7,9 +7,15 @@ MAKEFILE_CONFIGURE_BUILD_DEPENDS_GROFF_PFBTOPS_INCLUDED := 1 DEFAULT_PFBTOPSFLAGS := -PFBTOPSFLAGS ?= -PFBTOPSFLAGS_ ?= $(DEFAULT_PFBTOPSFLAGS) $(PFBTOPSFLAGS) -PFBTOPS ?= pfbtops +ifndef PFBTOPSFLAGS +PFBTOPSFLAGS := +endif +ifndef PFBTOPSFLAGS_ +PFBTOPSFLAGS_ := $(DEFAULT_PFBTOPSFLAGS) $(PFBTOPSFLAGS) +endif +ifndef PFBTOPS +PFBTOPS := pfbtops +endif endif # include guard diff --git a/share/mk/configure/build-depends/groff/post-grohtml.mk b/share/mk/configure/build-depends/groff/post-grohtml.mk index ed66bdcb2..86b74f50e 100644 --- a/share/mk/configure/build-depends/groff/post-grohtml.mk +++ b/share/mk/configure/build-depends/groff/post-grohtml.mk @@ -1,4 +1,4 @@ -# Copyright 2024, Alejandro Colomar +# Copyright 2024-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -7,9 +7,15 @@ MAKEFILE_CONFIGURE_BUILD_DEPENDS_GROFF_POST_GROHTML_INCLUDED := 1 DEFAULT_POST_GROHTMLFLAGS := -POST_GROHTMLFLAGS ?= -POST_GROHTMLFLAGS_ ?= $(DEFAULT_POST_GROHTMLFLAGS) $(POST_GROHTMLFLAGS) -POST_GROHTML ?= post-grohtml +ifndef POST_GROHTMLFLAGS +POST_GROHTMLFLAGS := +endif +ifndef POST_GROHTMLFLAGS_ +POST_GROHTMLFLAGS_ := $(DEFAULT_POST_GROHTMLFLAGS) $(POST_GROHTMLFLAGS) +endif +ifndef POST_GROHTML +POST_GROHTML := post-grohtml +endif endif # include guard diff --git a/share/mk/configure/build-depends/gzip/gzip.mk b/share/mk/configure/build-depends/gzip/gzip.mk index 82b3f57f3..a4e6e3576 100644 --- a/share/mk/configure/build-depends/gzip/gzip.mk +++ b/share/mk/configure/build-depends/gzip/gzip.mk @@ -1,4 +1,4 @@ -# Copyright 2023-2024, Alejandro Colomar +# Copyright 2023-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -7,9 +7,15 @@ MAKEFILE_CONFIGURE_BUILD_DEPENDS_GZIP_GZIP_INCLUDED := 1 DEFAULT_GZIPFLAGS := -n -GZIPFLAGS ?= -GZIPFLAGS_ ?= $(DEFAULT_GZIPFLAGS) $(GZIPFLAGS) -GZIP ?= gzip +ifndef GZIPFLAGS +GZIPFLAGS := +endif +ifndef GZIPFLAGS_ +GZIPFLAGS_ := $(DEFAULT_GZIPFLAGS) $(GZIPFLAGS) +endif +ifndef GZIP +GZIP := gzip +endif endif # include guard diff --git a/share/mk/configure/build-depends/iwyu/iwyu.mk b/share/mk/configure/build-depends/iwyu/iwyu.mk index 3c22f7733..9ddc1d5c0 100644 --- a/share/mk/configure/build-depends/iwyu/iwyu.mk +++ b/share/mk/configure/build-depends/iwyu/iwyu.mk @@ -1,4 +1,4 @@ -# Copyright 2022-2024, Alejandro Colomar +# Copyright 2022-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -9,9 +9,15 @@ MAKEFILE_CONFIGURE_BUILD_DEPENDS_IWYU_IWYU_INCLUDED := 1 DEFAULT_IWYUFLAGS := \ -Xiwyu --no_fwd_decls \ -Xiwyu --error -IWYUFLAGS ?= -IWYUFLAGS_ ?= $(DEFAULT_IWYUFLAGS) $(IWYUFLAGS) -IWYU ?= iwyu +ifndef IWYUFLAGS +IWYUFLAGS := +endif +ifndef IWYUFLAGS_ +IWYUFLAGS_ := $(DEFAULT_IWYUFLAGS) $(IWYUFLAGS) +endif +ifndef IWYU +IWYU := iwyu +endif endif # include guard diff --git a/share/mk/configure/build-depends/libc-bin/locale.mk b/share/mk/configure/build-depends/libc-bin/locale.mk index ac7b3915a..734614216 100644 --- a/share/mk/configure/build-depends/libc-bin/locale.mk +++ b/share/mk/configure/build-depends/libc-bin/locale.mk @@ -1,4 +1,4 @@ -# Copyright 2024, Alejandro Colomar +# Copyright 2024-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -6,7 +6,9 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_LIBC_BIN_LOCALE_INCLUDED MAKEFILE_CONFIGURE_BUILD_DEPENDS_LIBC_BIN_LOCALE_INCLUDED := 1 -LOCALE ?= locale +ifndef LOCALE +LOCALE := locale +endif endif # include guard diff --git a/share/mk/configure/build-depends/lzip/lzip.mk b/share/mk/configure/build-depends/lzip/lzip.mk index e8fa2e473..12b5266db 100644 --- a/share/mk/configure/build-depends/lzip/lzip.mk +++ b/share/mk/configure/build-depends/lzip/lzip.mk @@ -1,4 +1,4 @@ -# Copyright 2023-2024, Alejandro Colomar +# Copyright 2023-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -7,9 +7,15 @@ MAKEFILE_CONFIGURE_BUILD_DEPENDS_LZIP_LZIP_INCLUDED := 1 DEFAULT_LZIPFLAGS := -LZIPFLAGS ?= -LZIPFLAGS_ ?= $(DEFAULT_LZIPFLAGS) $(LZIPFLAGS) -LZIP ?= lzip +ifndef LZIPFLAGS +LZIPFLAGS := +endif +ifndef LZIPFLAGS_ +LZIPFLAGS_ := $(DEFAULT_LZIPFLAGS) $(LZIPFLAGS) +endif +ifndef LZIP +LZIP := lzip +endif endif # include guard diff --git a/share/mk/configure/build-depends/mandoc/mandoc.mk b/share/mk/configure/build-depends/mandoc/mandoc.mk index d78ee24d0..06891b34c 100644 --- a/share/mk/configure/build-depends/mandoc/mandoc.mk +++ b/share/mk/configure/build-depends/mandoc/mandoc.mk @@ -1,4 +1,4 @@ -# Copyright 2024, Alejandro Colomar +# Copyright 2024-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -7,9 +7,15 @@ MAKEFILE_CONFIGURE_BUILD_DEPENDS_MANDOC_MANDOC_INCLUDED := 1 DEFAULT_MANDOCFLAGS := -Tlint -MANDOCFLAGS ?= -MANDOCFLAGS_ ?= $(DEFAULT_MANDOCFLAGS) $(MANDOCFLAGS) -MANDOC ?= mandoc +ifndef MANDOCFLAGS +MANDOCFLAGS := +endif +ifndef MANDOCFLAGS_ +MANDOCFLAGS_ := $(DEFAULT_MANDOCFLAGS) $(MANDOCFLAGS) +endif +ifndef MANDOC +MANDOC := mandoc +endif endif # include guard diff --git a/share/mk/configure/build-depends/moreutils/sponge.mk b/share/mk/configure/build-depends/moreutils/sponge.mk index e5a57e57e..328406e7e 100644 --- a/share/mk/configure/build-depends/moreutils/sponge.mk +++ b/share/mk/configure/build-depends/moreutils/sponge.mk @@ -1,4 +1,4 @@ -# Copyright 2024, Alejandro Colomar +# Copyright 2024-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -6,7 +6,9 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_MOREUTILS_SPONGE_INCLUDED MAKEFILE_CONFIGURE_BUILD_DEPENDS_MOREUTILS_SPONGE_INCLUDED := 1 -SPONGE ?= sponge +ifndef SPONGE +SPONGE := sponge +endif endif # include guard diff --git a/share/mk/configure/build-depends/pkgconf/pkgconf.mk b/share/mk/configure/build-depends/pkgconf/pkgconf.mk index 353f47945..928e2b679 100644 --- a/share/mk/configure/build-depends/pkgconf/pkgconf.mk +++ b/share/mk/configure/build-depends/pkgconf/pkgconf.mk @@ -1,4 +1,4 @@ -# Copyright 2022-2024, Alejandro Colomar +# Copyright 2022-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -7,13 +7,21 @@ MAKEFILE_CONFIGURE_BUILD_DEPENDS_PKGCONF_PKGCONF_INCLUDED := 1 # Compat -PKG_CONFIG ?= pkgconf +ifndef PKG_CONFIG +PKG_CONFIG := pkgconf +endif DEFAULT_PKGCONFFLAGS := -PKGCONFFLAGS ?= -PKGCONFFLAGS_ ?= $(DEFAULT_PKGCONFFLAGS) $(PKGCONFFLAGS) -PKGCONF ?= $(PKG_CONFIG) +ifndef PKGCONFFLAGS +PKGCONFFLAGS := +endif +ifndef PKGCONFFLAGS_ +PKGCONFFLAGS_ := $(DEFAULT_PKGCONFFLAGS) $(PKGCONFFLAGS) +endif +ifndef PKGCONF +PKGCONF := $(PKG_CONFIG) +endif PKGCONF_CMD := $(PKGCONF) $(PKGCONFFLAGS_) diff --git a/share/mk/configure/build-depends/sed/sed.mk b/share/mk/configure/build-depends/sed/sed.mk index abe11aef0..8bd2ab602 100644 --- a/share/mk/configure/build-depends/sed/sed.mk +++ b/share/mk/configure/build-depends/sed/sed.mk @@ -1,4 +1,4 @@ -# Copyright 2022-2024, Alejandro Colomar +# Copyright 2022-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -6,7 +6,9 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_SED_SED_INCLUDED MAKEFILE_CONFIGURE_BUILD_DEPENDS_SED_SED_INCLUDED := 1 -SED ?= sed +ifndef SED +SED := sed +endif endif # include guard diff --git a/share/mk/configure/build-depends/shellcheck/shellcheck.mk b/share/mk/configure/build-depends/shellcheck/shellcheck.mk index efb7206e9..831be0cc1 100644 --- a/share/mk/configure/build-depends/shellcheck/shellcheck.mk +++ b/share/mk/configure/build-depends/shellcheck/shellcheck.mk @@ -1,4 +1,4 @@ -# Copyright 2022-2024, Alejandro Colomar +# Copyright 2022-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -11,9 +11,15 @@ include $(MAKEFILEDIR)/configure/directory_variables/src.mk SHELLCHECK_CONF := $(SYSCONFDIR)/shellcheck/shellcheckrc DEFAULT_SHELLCHECKFLAGS := -o all -SHELLCHECKFLAGS ?= -SHELLCHECKFLAGS_ ?= $(DEFAULT_SHELLCHECKFLAGS) $(SHELLCHECKFLAGS) -SHELLCHECK ?= shellcheck +ifndef SHELLCHECKFLAGS +SHELLCHECKFLAGS := +endif +ifndef SHELLCHECKFLAGS_ +SHELLCHECKFLAGS_ := $(DEFAULT_SHELLCHECKFLAGS) $(SHELLCHECKFLAGS) +endif +ifndef SHELLCHECK +SHELLCHECK := shellcheck +endif endif # include guard diff --git a/share/mk/configure/build-depends/tar/tar.mk b/share/mk/configure/build-depends/tar/tar.mk index 677d99a6e..640170faf 100644 --- a/share/mk/configure/build-depends/tar/tar.mk +++ b/share/mk/configure/build-depends/tar/tar.mk @@ -1,4 +1,4 @@ -# Copyright 2021-2024, Alejandro Colomar +# Copyright 2021-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -14,9 +14,15 @@ DEFAULT_TARFLAGS := \ --owner=root:0 \ --group=root:0 \ --mtime='$(DISTDATE)' -TARFLAGS ?= -TARFLAGS_ ?= $(DEFAULT_TARFLAGS) $(TARFLAGS) -TAR ?= tar +ifndef TARFLAGS +TARFLAGS := +endif +ifndef TARFLAGS_ +TARFLAGS_ := $(DEFAULT_TARFLAGS) $(TARFLAGS) +endif +ifndef TAR +TAR := tar +endif endif # include guard diff --git a/share/mk/configure/build-depends/texlive-fonts-extra-links/Tinos-Regular.ttf.mk b/share/mk/configure/build-depends/texlive-fonts-extra-links/Tinos-Regular.ttf.mk index 498ea4860..0c2919dca 100644 --- a/share/mk/configure/build-depends/texlive-fonts-extra-links/Tinos-Regular.ttf.mk +++ b/share/mk/configure/build-depends/texlive-fonts-extra-links/Tinos-Regular.ttf.mk @@ -1,4 +1,4 @@ -# Copyright 2024, Alejandro Colomar +# Copyright 2024-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -6,7 +6,9 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_TEXLIVE_FONTS_EXTRA_LINKS_TINOS_REGULAR_ MAKEFILE_CONFIGURE_BUILD_DEPENDS_TEXLIVE_FONTS_EXTRA_LINKS_TINOS_REGULAR_TTF_INCLUDED := 1 -TINOSR_TTF ?= /usr/share/texlive/texmf-dist/fonts/truetype/google/tinos/Tinos-Regular.ttf +ifndef TINOSR_TTF +TINOSR_TTF := /usr/share/texlive/texmf-dist/fonts/truetype/google/tinos/Tinos-Regular.ttf +endif endif # include guard diff --git a/share/mk/configure/build-depends/texlive-fonts-extra/Tinos.pfb.mk b/share/mk/configure/build-depends/texlive-fonts-extra/Tinos.pfb.mk index c640a701a..4e1293532 100644 --- a/share/mk/configure/build-depends/texlive-fonts-extra/Tinos.pfb.mk +++ b/share/mk/configure/build-depends/texlive-fonts-extra/Tinos.pfb.mk @@ -1,4 +1,4 @@ -# Copyright 2024, Alejandro Colomar +# Copyright 2024-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -6,7 +6,9 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_TEXLIVE_FONTS_EXTRA_TINOS_PFB_INCLUDED MAKEFILE_CONFIGURE_BUILD_DEPENDS_TEXLIVE_FONTS_EXTRA_TINOS_PFB_INCLUDED := 1 -TINOS_PFB ?= /usr/share/texlive/texmf-dist/fonts/type1/google/tinos/Tinos.pfb +ifndef TINOS_PFB +TINOS_PFB := /usr/share/texlive/texmf-dist/fonts/type1/google/tinos/Tinos.pfb +endif endif # include guard diff --git a/share/mk/configure/build-depends/xz-utils/xz.mk b/share/mk/configure/build-depends/xz-utils/xz.mk index d26a367cb..c869113e5 100644 --- a/share/mk/configure/build-depends/xz-utils/xz.mk +++ b/share/mk/configure/build-depends/xz-utils/xz.mk @@ -1,4 +1,4 @@ -# Copyright 2023-2024, Alejandro Colomar +# Copyright 2023-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -7,9 +7,15 @@ MAKEFILE_CONFIGURE_BUILD_DEPENDS_XZ_UTILS_XZ_INCLUDED := 1 DEFAULT_XZFLAGS := -XZFLAGS ?= -XZFLAGS_ ?= $(DEFAULT_XZFLAGS) $(XZFLAGS) -XZ ?= xz +ifndef XZFLAGS +XZFLAGS := +endif +ifndef XZFLAGS +XZFLAGS_ := $(DEFAULT_XZFLAGS) $(XZFLAGS) +endif +ifndef XZ +XZ := xz +endif endif # include guard diff --git a/share/mk/configure/directory_variables/build.mk b/share/mk/configure/directory_variables/build.mk index a005a4235..769567fc0 100644 --- a/share/mk/configure/directory_variables/build.mk +++ b/share/mk/configure/directory_variables/build.mk @@ -1,4 +1,4 @@ -# Copyright 2021-2024, Alejandro Colomar +# Copyright 2021-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -6,7 +6,9 @@ ifndef MAKEFILE_CONFIGURE_DIRECTORY_VARIABLES_BUILD_INCLUDED MAKEFILE_CONFIGURE_DIRECTORY_VARIABLES_BUILD_INCLUDED := 1 -builddir ?= .tmp +ifndef builddir +builddir := .tmp +endif endif # include guard diff --git a/share/mk/configure/directory_variables/install.mk b/share/mk/configure/directory_variables/install.mk index d1e605991..0314a4ab8 100644 --- a/share/mk/configure/directory_variables/install.mk +++ b/share/mk/configure/directory_variables/install.mk @@ -1,4 +1,4 @@ -# Copyright 2021-2024, Alejandro Colomar +# Copyright 2021-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -9,15 +9,33 @@ MAKEFILE_CONFIGURE_DIRECTORY_VARIABLES_INSTALL_INCLUDED := 1 include $(MAKEFILEDIR)/configure/directory_variables/src.mk -DESTDIR ?= -prefix ?= /usr/local -exec_prefix ?= $(prefix) -datarootdir ?= $(prefix)/share -mandir ?= $(datarootdir)/man -docdir ?= $(datarootdir)/doc -htmldir ?= $(docdir)/html/man -pdfdir ?= $(docdir)/pdf -bindir ?= $(exec_prefix)/bin +ifndef DESTDIR +DESTDIR := +endif +ifndef prefix +prefix := /usr/local +endif +ifndef exec_prefix +exec_prefix := $(prefix) +endif +ifndef datarootdir +datarootdir := $(prefix)/share +endif +ifndef mandir +mandir := $(datarootdir)/man +endif +ifndef docdir +docdir := $(datarootdir)/doc +endif +ifndef htmldir +htmldir := $(docdir)/html/man +endif +ifndef pdfdir +pdfdir := $(docdir)/pdf +endif +ifndef bindir +bindir := $(exec_prefix)/bin +endif $(foreach s, $(MANSECTIONS), \ diff --git a/share/mk/configure/man/link_pages.mk b/share/mk/configure/man/link_pages.mk index 69b9981bf..42828af9a 100644 --- a/share/mk/configure/man/link_pages.mk +++ b/share/mk/configure/man/link_pages.mk @@ -1,4 +1,4 @@ -# Copyright 2023-2024, Alejandro Colomar +# Copyright 2023-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -6,7 +6,9 @@ ifndef MAKEFILE_CONFIGURE_MAN_LINK_PAGES_INCLUDED MAKEFILE_CONFIGURE_MAN_LINK_PAGES_INCLUDED := 1 -LINK_PAGES ?= .so +ifndef LINK_PAGES +LINK_PAGES := .so +endif ifeq ($(LINK_PAGES),.so) else ifeq ($(LINK_PAGES),symlink) else diff --git a/share/mk/configure/version.mk b/share/mk/configure/version.mk index bd9884e21..802e88366 100644 --- a/share/mk/configure/version.mk +++ b/share/mk/configure/version.mk @@ -1,4 +1,4 @@ -# Copyright 2022-2024, Alejandro Colomar +# Copyright 2022-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -19,12 +19,20 @@ include $(MAKEFILEDIR)/configure/verbose.mk projname := man-pages -VERSION ?= $(shell $(GIT) describe --dirty | $(SED) 's/$(projname)-//') -EXTRAVERSION ?= +ifndef VERSION +VERSION := $(shell $(GIT) describe --dirty | $(SED) 's/$(projname)-//') +endif +ifndef EXTRAVERSION +EXTRAVERSION := +endif -DISTVERSION ?= $(VERSION)$(EXTRAVERSION) -DISTNAME ?= $(projname)-$(DISTVERSION) +ifndef DISTVERSION +DISTVERSION := $(VERSION)$(EXTRAVERSION) +endif +ifndef DISTNAME +DISTNAME := $(projname)-$(DISTVERSION) +endif DISTFILESCMD := \ @@ -47,7 +55,9 @@ DISTDATECMD := \ fi; -DISTDATE ?= $(shell $(DISTDATECMD)) +ifndef DISTDATE +DISTDATE := $(shell $(DISTDATECMD)) +endif MANPAGEDATECMD = $(GIT) log --format=%cs -1 -- $< $(HIDE_ERR) diff --git a/share/mk/configure/xfail.mk b/share/mk/configure/xfail.mk index 5aa7f8fd7..bdab9dc5e 100644 --- a/share/mk/configure/xfail.mk +++ b/share/mk/configure/xfail.mk @@ -1,4 +1,4 @@ -# Copyright 2024, Alejandro Colomar +# Copyright 2024-2025, Alejandro Colomar # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception @@ -6,7 +6,9 @@ ifndef MAKEFILE_CONFIGURE_XFAIL_INCLUDED MAKEFILE_CONFIGURE_XFAIL_INCLUDED := 1 -SKIP_XFAIL ?= yes +ifndef SKIP_XFAIL +SKIP_XFAIL := yes +endif ifeq ($(SKIP_XFAIL),yes) else ifeq ($(SKIP_XFAIL),no) else