3 files changed, 15 insertions, 14 deletions
diff --git a/src/libstore/lix-store.pc.in b/src/libstore/lix-store.pc.in
new file mode 100644
index 000000000..69c323a28
--- /dev/null
+++ b/src/libstore/lix-store.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: Lix libstore
+Description: Lix Package Manager (libstore)
+Version: @PACKAGE_VERSION@
+Requires: lix-base lix-util
+Libs: -L${libdir} -llixstore -llixutil
+Cflags: -I${includedir}/lix/libstore
diff --git a/src/libstore/meson.build b/src/libstore/meson.build
index 5fde92dd0..4ccb03df7 100644
--- a/src/libstore/meson.build
+++ b/src/libstore/meson.build
@@ -6,7 +6,7 @@ foreach header : [ 'schema.sql', 'ca-specific-schema.sql' ]
     output : '@PLAINNAME@.gen.hh',
     capture : true,
     install : true,
-    install_dir : includedir / 'nix',
+    install_dir : includedir / 'lix/libstore',
   )
 endforeach
 
@@ -201,7 +201,7 @@ foreach name, value : cpp_str_defines
 endforeach
 
 libstore = library(
-  'nixstore',
+  'lixstore',
   libstore_generated_headers,
   libstore_sources,
   dependencies : [
@@ -224,7 +224,7 @@ libstore = library(
   install_rpath : libdir,
 )
 
-install_headers(libstore_headers, subdir : 'nix', preserve_path : true)
+install_headers(libstore_headers, subdir : 'lix/libstore', preserve_path : true)
 
 # Used by libfetchers.
 liblixstore = declare_dependency(
@@ -235,8 +235,8 @@ liblixstore = declare_dependency(
 # FIXME: not using the pkg-config module because it creates way too many deps
 # while meson migration is in progress, and we want to not include boost here
 configure_file(
-  input : 'nix-store.pc.in',
-  output : 'nix-store.pc',
+  input : 'lix-store.pc.in',
+  output : 'lix-store.pc',
   install_dir : libdir / 'pkgconfig',
   configuration : {
     'prefix' : prefix,
diff --git a/src/libstore/nix-store.pc.in b/src/libstore/nix-store.pc.in
deleted file mode 100644
index dc42d0bca..000000000
--- a/src/libstore/nix-store.pc.in
+++ /dev/null
@@ -1,9 +0,0 @@
-prefix=@prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: Nix
-Description: Nix Package Manager
-Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lnixstore -lnixutil
-Cflags: -I${includedir}/nix -std=c++2a