Put systemd.pc into arch specific pkgconfig dir

It contains the arch specific libdir value.

diff --git a/debian/changelog b/debian/changelog
index e11dce4a967d09d6904ca7ae0bbea7307c875624..b54e6f7a15e10b06eab84f96997145d01e4803a3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ systemd (218-3) UNRELEASED; urgency=medium
     dir).
   * Use dh_installinit's --noscript instead of --no-start for the upstart
     jobs without sysvinit scripts (thanks lintian).
+  * Put systemd.pc into arch specific pkgconfig dir, as it contains the arch
+    specific libdir value.
 
  -- Martin Pitt <mpitt@debian.org>  Wed, 17 Dec 2014 09:22:17 +0100
 

diff --git a/debian/patches/build-sys-Fix-install-location-of-systemd.pc.patch b/debian/patches/build-sys-Fix-install-location-of-systemd.pc.patch
new file mode 100644 (file)
index 0000000..fc54d57
--- /dev/null
+++ b/debian/patches/build-sys-Fix-install-location-of-systemd.pc.patch
@@ -0,0 +1,44 @@
+From: Martin Pitt <martin.pitt@ubuntu.com>
+Date: Sun, 28 Dec 2014 12:14:25 +0100
+Subject: build-sys: Fix install location of systemd.pc
+
+systemd.pc contains "libdir" which can be architecture specific. Thus it needs
+to be installed into libdir/pkgconfig/ instead of datadir/pkgconfig.
+
+As nothing else is using pkgconfigdata any more, remove it entirely.
+
+Note that udev.pc does not contain architecture specific values and thus can be
+kept in /usr/share/pkgconfig/.
+---
+ Makefile.am | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 3138fc3..6bc4c58 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -74,7 +74,6 @@ dbussessionservicedir=@dbussessionservicedir@
+ dbussystemservicedir=@dbussystemservicedir@
+ pamlibdir=@pamlibdir@
+ pamconfdir=@pamconfdir@
+-pkgconfigdatadir=$(datadir)/pkgconfig
+ pkgconfiglibdir=$(libdir)/pkgconfig
+ polkitpolicydir=$(datadir)/polkit-1/actions
+ bashcompletiondir=@bashcompletiondir@
+@@ -1301,7 +1300,7 @@ dist_dbussystemservice_DATA += \
+ polkitpolicy_in_in_files += \
+       src/core/org.freedesktop.systemd1.policy.in.in
+ 
+-pkgconfigdata_DATA = \
++pkgconfiglib_DATA += \
+       src/core/systemd.pc
+ 
+ nodist_rpmmacros_DATA = \
+@@ -5985,7 +5984,6 @@ EXTRA_DIST += \
+ CLEANFILES += \
+       $(nodist_systemunit_DATA) \
+       $(nodist_userunit_DATA) \
+-      $(pkgconfigdata_DATA) \
+       $(pkgconfiglib_DATA) \
+       $(nodist_polkitpolicy_DATA)
+ 

diff --git a/debian/patches/series b/debian/patches/series
index 145026b02977d139ee0ef8d4a22f005c0d91ec9a..e818b14474cf72a65aa38a66bf999d1de98fba3e 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -52,3 +52,4 @@ Prefer-etc-X11-default-display-manager-if-present.patch
 Re-enable-journal-forwarding-to-syslog.patch
 Disable-tests-which-fail-on-buildds.patch
 Make-sd_login_monitor_new-work-for-logind-without-sy.patch
+build-sys-Fix-install-location-of-systemd.pc.patch

diff --git a/debian/systemd.install b/debian/systemd.install
index 908a68bbce5fdc59ff58a95e850c5120cb063f78..fdfd89d4a3c0c434ad854fc3474c52c3787ebf3a 100644 (file)
--- a/debian/systemd.install
+++ b/debian/systemd.install
@@ -38,7 +38,7 @@ usr/share/bash-completion/
 usr/share/zsh/vendor-completions/
 usr/share/dbus-1/
 usr/share/doc/
-usr/share/pkgconfig/systemd.pc
+usr/lib/*/pkgconfig/systemd.pc
 usr/share/polkit-1/
 usr/share/systemd/kbd-model-map
 usr/lib/binfmt.d/