move c header to includedir/astal

2 files changed, 4 insertions, 21 deletions

diff --git a/meson-install.sh b/meson-install.sh
deleted file mode 100644
index 0e6b258..0000000
--- a/meson-install.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-meson setup \
-	--prefix /usr \
-	--libexecdir lib \
-	--sbindir bin \
-	--buildtype plain \
-	--auto-features enabled \
-	--wrap-mode nodownload \
-	-D b_lto=false \
-	-D b_pie=true \
-	-D python.bytecompile=1 \
-	--wipe \
-	build
-
-meson install -C build
diff --git a/src/meson.build b/src/meson.build
index 4c76a35..03966e2 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -2,7 +2,7 @@ version_split = meson.project_version().split('.')
 api_version = version_split[0] + '.' + version_split[1]
 gir = 'AstalNotifd-' + api_version + '.gir'
 typelib = 'AstalNotifd-' + api_version + '.typelib'
-so = 'libastal-notifd.so.' + meson.project_version()
+so = 'lib' + meson.project_name() + '.so.' + meson.project_version()
 
 config = configure_file(
   input: 'config.vala.in',
@@ -36,17 +36,16 @@ if get_option('lib')
     meson.project_name(),
     sources,
     dependencies: deps,
-    vala_header: meson.project_name() + '-' + api_version + '.h',
+    vala_header: meson.project_name().replace('astal-', '') + '.h',
     vala_vapi: meson.project_name() + '-' + api_version + '.vapi',
     vala_gir: gir,
     version: meson.project_version(),
     install: true,
-    install_dir: [true, true, true, true],
+    install_dir: [true, get_option('includedir') / 'astal', true, true],
   )
 
   import('pkgconfig').generate(
-    description: 'libastal-notifd',
-    libraries: lib,
+    lib,
     name: meson.project_name(),
     filebase: meson.project_name() + '-' + api_version,
     version: meson.project_version(),