From 0a4e911cf478d0d38082a8840a5acc8f57d00086 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 3 Feb 2020 18:04:09 +0100 Subject: [PATCH] Install headers in the correct location --- local.mk | 2 +- src/libexpr/local.mk | 3 +++ src/libstore/local.mk | 6 ++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/local.mk b/local.mk index 55f85a044..a63cfd843 100644 --- a/local.mk +++ b/local.mk @@ -8,7 +8,7 @@ clean-files += Makefile.config GLOBAL_CXXFLAGS += -I . -I src -I src/libutil -I src/libstore -I src/libmain -I src/libexpr -I src/nix -Wno-deprecated-declarations -$(foreach i, config.h $(call rwildcard, src/lib*, *.hh), \ +$(foreach i, config.h $(wildcard src/lib*/*.hh), \ $(eval $(call install-file-in, $(i), $(includedir)/nix, 0644))) $(GCH) $(PCH): src/libutil/util.hh config.h diff --git a/src/libexpr/local.mk b/src/libexpr/local.mk index c2225383f..6acb0150c 100644 --- a/src/libexpr/local.mk +++ b/src/libexpr/local.mk @@ -36,3 +36,6 @@ clean-files += $(d)/parser-tab.cc $(d)/parser-tab.hh $(d)/lexer-tab.cc $(d)/lexe dist-files += $(d)/parser-tab.cc $(d)/parser-tab.hh $(d)/lexer-tab.cc $(d)/lexer-tab.hh $(eval $(call install-file-in, $(d)/nix-expr.pc, $(prefix)/lib/pkgconfig, 0644)) + +$(foreach i, $(wildcard src/libexpr/flake/*.hh), \ + $(eval $(call install-file-in, $(i), $(includedir)/nix/flake, 0644))) diff --git a/src/libstore/local.mk b/src/libstore/local.mk index e803ff85a..e8cbe422c 100644 --- a/src/libstore/local.mk +++ b/src/libstore/local.mk @@ -60,3 +60,9 @@ $(d)/build.cc: clean-files += $(d)/schema.sql.gen.hh $(eval $(call install-file-in, $(d)/nix-store.pc, $(prefix)/lib/pkgconfig, 0644)) + +$(foreach i, $(wildcard src/libstore/builtins/*.hh), \ + $(eval $(call install-file-in, $(i), $(includedir)/nix/builtins, 0644))) + +$(foreach i, $(wildcard src/libstore/fetchers/*.hh), \ + $(eval $(call install-file-in, $(i), $(includedir)/nix/fetchers, 0644)))