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.

diff --git a/Makefile.am b/Makefile.am
index 6a03bc46f285f37ad490c2313e4c724456eb0cb2..77a92cf1fdc2d37cc5f88b42b220edf1f96d2f23 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -74,6 +74,7 @@ dbussessionservicedir=@dbussessionservicedir@
 dbussystemservicedir=@dbussystemservicedir@
 pamlibdir=@pamlibdir@
 pamconfdir=@pamconfdir@
+pkgconfigdatadir=$(datadir)/pkgconfig
 pkgconfiglibdir=$(libdir)/pkgconfig
 polkitpolicydir=$(datadir)/polkit-1/actions
 bashcompletiondir=@bashcompletiondir@
@@ -131,6 +132,7 @@ noinst_LTLIBRARIES =
 lib_LTLIBRARIES =
 include_HEADERS =
 noinst_DATA =
+pkgconfigdata_DATA =
 pkgconfiglib_DATA =
 polkitpolicy_in_in_files =
 polkitpolicy_in_files =
@@ -164,6 +166,7 @@ in_in_files = $(filter %.in.in, $(in_files))
 m4_files = $(filter %.m4,$(EXTRA_DIST) $(in_files:.m4.in=.m4))
 
 CLEANFILES = $(BUILT_SOURCES) \
+       $(pkgconfigdata_DATA) \
        $(pkgconfiglib_DATA) \
        $(in_files:.in=) $(in_in_files:.in.in=) \
        $(m4_files:.m4=)
@@ -1346,7 +1349,7 @@ dist_dbussystemservice_DATA += \
 polkitpolicy_in_in_files += \
        src/core/org.freedesktop.systemd1.policy.in.in
 
-pkgconfiglib_DATA += \
+pkgconfigdata_DATA += \
        src/core/systemd.pc
 
 nodist_rpmmacros_DATA = \

diff --git a/man/file-hierarchy.xml b/man/file-hierarchy.xml
index df97884ae62d212a957b4d796726b2e40e5b457d..3a5627d196c74fe3dc3a5dcb365ac52f8a9145af 100644 (file)
--- a/man/file-hierarchy.xml
+++ b/man/file-hierarchy.xml
@@ -257,7 +257,6 @@
         architecture-dependent, too. To query
         <varname>$libdir</varname> for the primary architecture of the
         system, invoke:
-        <programlisting># pkg-config --variable=libdir systemd</programlisting> or
         <programlisting># systemd-path system-library-arch</programlisting></para></listitem>
 
       </varlistentry>

diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in
index d5b86bf65ce374c42662c27182a8724965c0bc87..ac52b30dd37a3e19255b8f841ca46f2cf516c4a9 100644 (file)
--- 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@