summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@ubuntu.com>2014-12-28 12:14:25 +0100
committerMartin Pitt <martin.pitt@ubuntu.com>2015-01-01 16:53:40 +0100
commitaec432c6134146e138124c4130be2ee89dca07fa (patch)
tree5376c3182bde24ee51048a4f1c3addd33bdf5faa
parent2e219e5672689dad60e110f0b3366765506c4c58 (diff)
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/.
-rw-r--r--Makefile.am4
1 files changed, 1 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 5f80306dd3..73e911f6bf 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@
@@ -1303,7 +1302,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 = \
@@ -6082,7 +6081,6 @@ EXTRA_DIST += \
CLEANFILES += \
$(nodist_systemunit_DATA) \
$(nodist_userunit_DATA) \
- $(pkgconfigdata_DATA) \
$(pkgconfiglib_DATA) \
$(nodist_polkitpolicy_DATA)