diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2021-08-16 11:56:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-16 11:56:49 +0200 |
| commit | 2cd1a5b8f31627a09ac34afcbb0f76e90606204f (patch) | |
| tree | cffe982437a762f5eeb692e2167c953c97ab29d6 | |
| parent | 902b0505117c3619055c78eac1599dcc406cfc97 (diff) | |
| parent | 9f13cb31e82c0c2872eabe02d25c797fefc42f55 (diff) | |
Merge pull request #5134 from pszubiak/fix-pkgconfig-install-path
Install pkg-config files in the correct location
| -rw-r--r-- | src/libcmd/local.mk | 2 | ||||
| -rw-r--r-- | src/libexpr/local.mk | 2 | ||||
| -rw-r--r-- | src/libmain/local.mk | 2 | ||||
| -rw-r--r-- | src/libstore/local.mk | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/libcmd/local.mk b/src/libcmd/local.mk index 431d8ec06..0a684468e 100644 --- a/src/libcmd/local.mk +++ b/src/libcmd/local.mk @@ -12,4 +12,4 @@ libcmd_LDFLAGS = -llowdown -pthread libcmd_LIBS = libstore libutil libexpr libmain libfetchers -$(eval $(call install-file-in, $(d)/nix-cmd.pc, $(prefix)/lib/pkgconfig, 0644)) +$(eval $(call install-file-in, $(d)/nix-cmd.pc, $(libdir)/pkgconfig, 0644)) diff --git a/src/libexpr/local.mk b/src/libexpr/local.mk index 17b83aafd..5ba11c619 100644 --- a/src/libexpr/local.mk +++ b/src/libexpr/local.mk @@ -35,7 +35,7 @@ $(d)/lexer-tab.cc $(d)/lexer-tab.hh: $(d)/lexer.l clean-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)) +$(eval $(call install-file-in, $(d)/nix-expr.pc, $(libdir)/pkgconfig, 0644)) $(foreach i, $(wildcard src/libexpr/flake/*.hh), \ $(eval $(call install-file-in, $(i), $(includedir)/nix/flake, 0644))) diff --git a/src/libmain/local.mk b/src/libmain/local.mk index a8eed6c65..f45d6e3ff 100644 --- a/src/libmain/local.mk +++ b/src/libmain/local.mk @@ -14,4 +14,4 @@ libmain_LIBS = libstore libutil libmain_ALLOW_UNDEFINED = 1 -$(eval $(call install-file-in, $(d)/nix-main.pc, $(prefix)/lib/pkgconfig, 0644)) +$(eval $(call install-file-in, $(d)/nix-main.pc, $(libdir)/pkgconfig, 0644)) diff --git a/src/libstore/local.mk b/src/libstore/local.mk index 44316f542..b87cee8d5 100644 --- a/src/libstore/local.mk +++ b/src/libstore/local.mk @@ -60,7 +60,7 @@ $(d)/build.cc: clean-files += $(d)/schema.sql.gen.hh $(d)/ca-specific-schema.sql.gen.hh -$(eval $(call install-file-in, $(d)/nix-store.pc, $(prefix)/lib/pkgconfig, 0644)) +$(eval $(call install-file-in, $(d)/nix-store.pc, $(libdir)/pkgconfig, 0644)) $(foreach i, $(wildcard src/libstore/builtins/*.hh), \ $(eval $(call install-file-in, $(i), $(includedir)/nix/builtins, 0644))) |