summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-04-21 20:35:17 +0200
committerLennart Poettering <lennart@poettering.net>2015-04-21 20:35:17 +0200
commit3bd3150367f5751e4d1dff8e070d2deb3be3489a (patch)
tree3f57c132c78e90cc7c4759377aebb3d60d05ef5f /src/core
parente911de996a72af7659e4019f03b80f11c476f3f3 (diff)
build-sys: move systemd.pc from pkgconfiglibdir back into pkgconfigdatadir
The original idea of systemd.pc was to contain arch-independent system and systemd information. By exposing libdir as part of the fields (added in eb39a6239c631873db62f6a942e6cb3dab0a2db4), it started to carry arch-dependent data, thus breaking multilib systems. It was then moved to pkgconfiglibdir to deal with this (in aec432c6134146e138124c4130be2ee89dca07fa), but actually the right approach is to simply not include libdir in the .pc file at all. THis patch hence more or less reverts both commits again, and moves the .pc file back into pkgconfigdatadir. As alternative for querying the systems primary libdir there's now "systemd-path system-library-arch", hence a more correct alternative exists for querying this variable from the .pc file.
Diffstat (limited to 'src/core')
-rw-r--r--src/core/systemd.pc.in1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in
index d5b86bf65c..ac52b30dd3 100644
--- a/src/core/systemd.pc.in
+++ b/src/core/systemd.pc.in
@@ -6,7 +6,6 @@
# (at your option) any later version.
prefix=@prefix@
-libdir=@libdir@
systemdutildir=@rootlibexecdir@
systemdsystemunitdir=@systemunitdir@
systemdsystempresetdir=@systempresetdir@