aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2022-01-06 22:34:03 +0100
committerEelco Dolstra <edolstra@gmail.com>2022-01-06 22:34:03 +0100
commitf71d84672b6880634434f58c809c1341499e45e5 (patch)
tree0c5444a9c296bc3192eb47363ff520fcf9a5aac9
parent5c7d3b351ff386e4864261b34b138d5b39d958b6 (diff)
parent3884f7a69a57d8ecfcbcaae476ec2ff53ffbd549 (diff)
Merge branch 'install-nlohmann-json-headers' of https://github.com/hercules-ci/nix
-rw-r--r--Makefile1
-rw-r--r--src/nlohmann/local.mk2
2 files changed, 3 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 5040d2884..e6ce50cbd 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,7 @@ makefiles = \
src/libexpr/local.mk \
src/libcmd/local.mk \
src/nix/local.mk \
+ src/nlohmann/local.mk \
src/resolve-system-dependencies/local.mk \
scripts/local.mk \
misc/bash/local.mk \
diff --git a/src/nlohmann/local.mk b/src/nlohmann/local.mk
new file mode 100644
index 000000000..63c427e00
--- /dev/null
+++ b/src/nlohmann/local.mk
@@ -0,0 +1,2 @@
+$(foreach i, $(wildcard src/nlohmann/*.hpp), \
+ $(eval $(call install-file-in, $(i), $(includedir)/nlohmann, 0644)))