build-sys: Make pkgconfigdir and cmakedir configurable

Makefile.am

@@ -80,7 +80,6 @@ dist_vapi_DATA = \
 		vala/libpulse-mainloop-glib.deps vala/libpulse-mainloop-glib.vapi \
 		vala/libpulse-simple.deps vala/libpulse-simple.vapi
 
-pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libpulse.pc libpulse-simple.pc
 
 if HAVE_GLIB20
@@ -88,7 +87,6 @@ pkgconfig_DATA += \
 	 libpulse-mainloop-glib.pc
 endif
 
-cmakedir = $(libdir)/cmake/PulseAudio
 cmake_DATA = PulseAudioConfig.cmake PulseAudioConfigVersion.cmake
 
 bashcompletiondir=@bashcompletiondir@

configure.ac

@@ -98,6 +98,11 @@ AS_IF([test "x$M4" = "xno"], AC_MSG_ERROR([m4 missing]))
 # pkg-config
 
 PKG_PROG_PKG_CONFIG
+AC_DEFINE_DIR([pkgconfigdir],[],["PKGConfig dir"])
+AC_ARG_WITH(
+        [pkgconfigdir],
+        AS_HELP_STRING([--with-pkgconfigdir],[Directory where to install pkgconfig rules to (defaults to $(libdir)/pkgconfig)]),
+        [pkgconfigdir="$withval"], [pkgconfigdir="$libdir/pkgconfig"])
 
 # gettext
 
@@ -1582,6 +1587,12 @@ AS_IF([test "x$HAVE_SYSTEMD_DAEMON" = "x1"],
     ])
 
 # CMake related ProjectConfig files
+AC_DEFINE_DIR([cmakedir],[],["CMake Template dir"])
+AC_ARG_WITH(
+        [cmakedir],
+        AS_HELP_STRING([--with-cmakedir],[Directory where to install cmake templates to (defaults to $(libdir)/cmake)]),
+        [cmakedir="$withval/PulseAudio"], [cmakedir="$libdir/cmake/PulseAudio"])
+
 PA_LIBDIR="$libdir"
 AX_DEFINE_DIR(PA_LIBDIR, PA_LIBDIR, [PulseAudio library dir])
 PA_INCDIR="$includedir"

meson.build

@@ -59,6 +59,10 @@ assert(prefix.startswith('/'), 'Prefix is not absolute: "@0@"'.format(prefix))
 bindir = join_paths(prefix, get_option('bindir'))
 includedir = join_paths(prefix, get_option('includedir'))
 libdir = join_paths(prefix, get_option('libdir'))
+cmakedir = get_option('cmakedir')
+if cmakedir == ''
+    cmakedir = join_paths(libdir, 'cmake', 'PulseAudio')
+endif
 libexecdir = join_paths(prefix, get_option('libexecdir'))
 mandir = join_paths(prefix, get_option('mandir'))
 datadir = join_paths(prefix, get_option('datadir'))
@@ -67,8 +71,10 @@ localstatedir = join_paths(prefix, get_option('localstatedir'))
 sysconfdir = join_paths(prefix, get_option('sysconfdir'))
 privlibdir = join_paths(libdir, 'pulseaudio')
 alsadatadir = join_paths(datadir, 'pulseaudio', 'alsa-mixer')
-
+pkgconfigdir = get_option('pkgconfig')
-pkgconfigdir = join_paths(libdir, 'pkgconfig')
+if pkgconfigdir == ''
+    pkgconfigdir = join_paths(libdir, 'pkgconfig')
+endif
 pulselibexecdir = join_paths(libexecdir, 'pulse')
 pulsesysconfdir = join_paths(sysconfdir, 'pulse')
 
@@ -741,8 +747,6 @@ endforeach
 
 m4 = find_program('m4', required: true)
 
-cmakedir = join_paths(libdir, 'cmake', 'PulseAudio')
-
 cmake_template_file = configure_file(
   input : 'PulseAudioConfig.cmake.in',
   output : 'PulseAudioConfig.cmake.tmp',
@@ -778,6 +782,8 @@ summary = [
   'prefix:                        @0@'.format(prefix),
   'bindir:                        @0@'.format(bindir),
   'libdir:                        @0@'.format(libdir),
+  'pkgconfigdir:                  @0@'.format(pkgconfigdir),
+  'cmakedir:                      @0@'.format(cmakedir),
   'libexecdir:                    @0@'.format(libexecdir),
   'mandir:                        @0@'.format(mandir),
   'datadir:                       @0@'.format(datadir),

meson_options.txt

@@ -60,6 +60,12 @@ option('bashcompletiondir',
 option('zshcompletiondir',
        type : 'string',
        description : 'Directory for zsh completion scripts ["no" disables]')
+option('cmakedir',
+       type : 'string',
+       description : 'Directory for CMakeTemplates')
+option('pkgconfig',
+       type : 'string',
+       description : 'Directory for Pkgconfig Files')
 
 # Optional features