summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWim Taymans <wtaymans@redhat.com>2017-06-16 17:47:56 +0200
committerWim Taymans <wtaymans@redhat.com>2017-06-16 17:56:18 +0200
commit6df165315ce43c69f43d3fcae0a087cb03f143a2 (patch)
treec37d495fd25748c1de259e5db14e22779a42f88a
parent573e032cc1f9314790f9e970d6d73b96e0019bd7 (diff)
man: fixes
-rw-r--r--man/meson.build2
-rw-r--r--pipewire.spec3
-rw-r--r--pipewire/client/meson.build2
-rw-r--r--pipewire/server/meson.build2
4 files changed, 4 insertions, 5 deletions
diff --git a/man/meson.build b/man/meson.build
index 438aa4c8..2a25e9bf 100644
--- a/man/meson.build
+++ b/man/meson.build
@@ -20,5 +20,5 @@ foreach m : manpages
command : [xmltoman, '@INPUT@'],
capture : true,
install : true,
- install_dir : 'subdir')
+ install_dir : join_paths(get_option('mandir'), 'man1'))
endforeach
diff --git a/pipewire.spec b/pipewire.spec
index 5d4a4dcb..73474d47 100644
--- a/pipewire.spec
+++ b/pipewire.spec
@@ -1,4 +1,4 @@
-%global majorminor 0.1.0
+%global majorminor 0.1
#global snap 20141103
#global gitrel 327
@@ -98,7 +98,6 @@ exit 0
%files
%license LICENSE GPL LGPL
%doc README
-%{_sysconfdir}/xdg/autostart/pipewire.desktop
%{_bindir}/pipewire
%{_libdir}/libpipewire-%{majorminor}.so
%{_libdir}/libpipewirecore-%{majorminor}.so
diff --git a/pipewire/client/meson.build b/pipewire/client/meson.build
index b50a968a..279eeaa2 100644
--- a/pipewire/client/meson.build
+++ b/pipewire/client/meson.build
@@ -52,7 +52,7 @@ libpipewire_c_args = [
]
-libpipewire = shared_library('pipewire', pipewire_sources,
+libpipewire = shared_library('pipewire-@0@'.format(apiversion), pipewire_sources,
version : libversion,
soversion : soversion,
c_args : libpipewire_c_args,
diff --git a/pipewire/server/meson.build b/pipewire/server/meson.build
index fd2d2bf0..2f63bc89 100644
--- a/pipewire/server/meson.build
+++ b/pipewire/server/meson.build
@@ -38,7 +38,7 @@ libpipewirecore_c_args = [
]
-libpipewirecore = shared_library('pipewirecore', pipewirecore_sources,
+libpipewirecore = shared_library('pipewirecore-@0@'.format(apiversion), pipewirecore_sources,
version : libversion,
soversion : soversion,
c_args : libpipewirecore_c_args,