mirror of
https://github.com/NixOS/nix.git
synced 2024-11-22 14:52:55 +00:00
GNU Make 3.81 compatibility
3.81 doesn't understand the ‘define foo =’ syntax, which was added in 3.82. So use ‘define foo’ instead.
This commit is contained in:
parent
143224f7cd
commit
4ee6001f95
@ -1,6 +1,6 @@
|
||||
# Add a rule for creating $(1) as a directory. This template may be
|
||||
# called multiple times for the same directory.
|
||||
define create-dir =
|
||||
define create-dir
|
||||
ifndef $(1)_SEEN
|
||||
$(1)_SEEN = 1
|
||||
$(1):
|
||||
@ -11,7 +11,7 @@ endef
|
||||
|
||||
# Add a rule for installing file $(1) as file $(2) with mode $(3).
|
||||
# The directory containing $(2) will be created automatically.
|
||||
define install-file-as =
|
||||
define install-file-as
|
||||
|
||||
install: $(2)
|
||||
|
||||
@ -25,23 +25,23 @@ endef
|
||||
|
||||
# Add a rule for installing file $(1) in directory $(2) with mode
|
||||
# $(3). The directory will be created automatically.
|
||||
define install-file-in =
|
||||
define install-file-in
|
||||
$$(eval $$(call install-file-as,$(1),$(2)/$$(notdir $(1)),$(3)))
|
||||
endef
|
||||
|
||||
|
||||
define install-program-in =
|
||||
define install-program-in
|
||||
$$(eval $$(call install-file-in,$(1),$(2),0755))
|
||||
endef
|
||||
|
||||
|
||||
define install-data-in =
|
||||
define install-data-in
|
||||
$$(eval $$(call install-file-in,$(1),$(2),0644))
|
||||
endef
|
||||
|
||||
|
||||
# Install a symlink from $(2) to $(1). Note that $(1) need not exist.
|
||||
define install-symlink =
|
||||
define install-symlink
|
||||
|
||||
install: $(2)
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
define build-jar =
|
||||
define build-jar
|
||||
$(1)_NAME ?= $(1)
|
||||
|
||||
_d := $$(strip $$($(1)_DIR))
|
||||
|
@ -60,7 +60,7 @@ include mk/tests.mk
|
||||
|
||||
|
||||
# Include all sub-Makefiles.
|
||||
define include-sub-makefile =
|
||||
define include-sub-makefile
|
||||
d := $$(patsubst %/,%,$$(dir $(1)))
|
||||
include $(1)
|
||||
endef
|
||||
|
@ -38,7 +38,7 @@ endif
|
||||
#
|
||||
# - BUILD_SHARED_LIBS: if equal to ‘1’, a dynamic library will be
|
||||
# built, otherwise a static library.
|
||||
define build-library =
|
||||
define build-library
|
||||
$(1)_NAME ?= $(1)
|
||||
_d := $$(strip $$($(1)_DIR))
|
||||
_srcs := $$(sort $$(foreach src, $$($(1)_SOURCES), $$(src)))
|
||||
|
@ -15,7 +15,7 @@ programs-list :=
|
||||
#
|
||||
# - $(1)_INSTALL_DIR: the directory where the program will be
|
||||
# installed; defaults to $(bindir).
|
||||
define build-program =
|
||||
define build-program
|
||||
_d := $$($(1)_DIR)
|
||||
_srcs := $$(sort $$(foreach src, $$($(1)_SOURCES), $$(src)))
|
||||
$(1)_OBJS := $$(addsuffix .o, $$(basename $$(_srcs)))
|
||||
|
@ -2,7 +2,7 @@ template-files :=
|
||||
|
||||
# Create the file $(1) from $(1).in by running config.status (which
|
||||
# substitutes all ‘@var@’ variables set by the configure script).
|
||||
define instantiate-template =
|
||||
define instantiate-template
|
||||
|
||||
clean-files += $(1)
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
# Run program $1 as part of ‘make installcheck’.
|
||||
define run-install-test =
|
||||
define run-install-test
|
||||
|
||||
installcheck: $1
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user