From d4a71ec3bfefa2f07e076895217414a9a842d6dc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 18 Sep 2014 15:42:01 +0200 Subject: [PATCH] Update spec file http://hydra.nixos.org/build/14344391 --- nix.spec.in | 1 + src/libexpr/local.mk | 2 +- src/libmain/local.mk | 2 +- src/libstore/local.mk | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/nix.spec.in b/nix.spec.in index 7d7775b87..4dbfdfa09 100644 --- a/nix.spec.in +++ b/nix.spec.in @@ -181,6 +181,7 @@ systemctl start nix-daemon.socket %files devel %{_includedir}/nix +%{_prefix}/lib/pkgconfig/*.pc %files doc %docdir %{_defaultdocdir}/%{name}-doc-%{version} diff --git a/src/libexpr/local.mk b/src/libexpr/local.mk index 6bb151167..4c1f4de19 100644 --- a/src/libexpr/local.mk +++ b/src/libexpr/local.mk @@ -27,4 +27,4 @@ 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, $(libdir)/pkgconfig, 0644)) +$(eval $(call install-file-in, $(d)/nix-expr.pc, $(prefix)/lib/pkgconfig, 0644)) diff --git a/src/libmain/local.mk b/src/libmain/local.mk index 4b6a4767e..16dbf7528 100644 --- a/src/libmain/local.mk +++ b/src/libmain/local.mk @@ -10,4 +10,4 @@ libmain_LIBS = libstore libutil libformat libmain_ALLOW_UNDEFINED = 1 -$(eval $(call install-file-in, $(d)/nix-main.pc, $(libdir)/pkgconfig, 0644)) +$(eval $(call install-file-in, $(d)/nix-main.pc, $(prefix)/lib/pkgconfig, 0644)) diff --git a/src/libstore/local.mk b/src/libstore/local.mk index 024d7dec7..7c99fd77a 100644 --- a/src/libstore/local.mk +++ b/src/libstore/local.mk @@ -31,4 +31,4 @@ $(d)/local-store.cc: $(d)/schema.sql.hh clean-files += $(d)/schema.sql.hh -$(eval $(call install-file-in, $(d)/nix-store.pc, $(libdir)/pkgconfig, 0644)) +$(eval $(call install-file-in, $(d)/nix-store.pc, $(prefix)/lib/pkgconfig, 0644))