[systemd-commits] 3 commits - Makefile.am src/core

[Lennart Poettering]

 Makefile.am            |    8 +++++++-
 src/core/systemd.pc.in |    9 ++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

New commits:
commit ded21b6de3826c6d7a22aa67dc538e2417f43b70
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Jun 30 23:10:11 2014 +0200

    pc: no longer expose exec_prefix in .pc file
    
    There's little reason to export this, so let's drop it to minimize the
    file a bit.

diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in
index f7c6b86..d5b86bf 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@
-exec_prefix=@exec_prefix@
 libdir=@libdir@
 systemdutildir=@rootlibexecdir@
 systemdsystemunitdir=@systemunitdir@

commit d4e85aac0bed39c8341da2614609c3d62825f1bf
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Jun 30 23:09:42 2014 +0200

    pc: expose more drop-in dirs in the .pc file

diff --git a/Makefile.am b/Makefile.am
index bb85b2c..60f69fe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -90,6 +90,8 @@ userpresetdir=$(prefix)/lib/systemd/user-preset
 tmpfilesdir=$(prefix)/lib/tmpfiles.d
 sysusersdir=$(prefix)/lib/sysusers.d
 sysctldir=$(prefix)/lib/sysctl.d
+binfmtdir=$(prefix)/lib/binfmt.d
+modulesloaddir=$(prefix)/lib/modules-load.d
 networkdir=$(rootprefix)/lib/systemd/network
 pkgincludedir=$(includedir)/systemd
 systemgeneratordir=$(rootlibexecdir)/system-generators
@@ -5138,7 +5140,11 @@ substitutions = \
        '|DNS_SERVERS=$(DNS_SERVERS)|' \
        '|systemuidmax=$(SYSTEM_UID_MAX)|' \
        '|systemgidmax=$(SYSTEM_GID_MAX)|' \
-       '|TTY_GID=$(TTY_GID)|'
+       '|TTY_GID=$(TTY_GID)|' \
+       '|systemsleepdir=$(systemsleepdir)|' \
+       '|systemshutdowndir=$(systemshutdowndir)|' \
+       '|binfmtdir=$(binfmtdir)|' \
+       '|modulesloaddir=$(modulesloaddir)|'
 
 SED_PROCESS = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in
index 786b1cf..f7c6b86 100644
--- a/src/core/systemd.pc.in
+++ b/src/core/systemd.pc.in
@@ -19,6 +19,13 @@ systemdsystemunitpath=${systemdsystemconfdir}:/etc/systemd/system:/run/systemd/s
 systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/run/systemd/user:/usr/local/lib/systemd/user:/usr/local/share/systemd/user:${systemduserunitdir}:/usr/lib/systemd/user:/usr/share/systemd/user
 systemdsystemgeneratordir=@systemgeneratordir@
 systemdusergeneratordir=@usergeneratordir@
+systemdsleepdir=@systemsleepdir@
+systemdshutdowndir=@systemshutdowndir@
+tmpfilesdir=@tmpfilesdir@
+sysusersdir=@sysusersdir@
+sysctldir=@sysctldir@
+binfmtdir=@binfmtdir@
+modulesloaddir=@modulesloaddir@
 catalogdir=@catalogdir@
 systemuidmax=@systemuidmax@
 systemgidmax=@systemgidmax@

commit eb39a6239c631873db62f6a942e6cb3dab0a2db4
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Jun 30 23:04:26 2014 +0200

    pc: export $libdir in the .pc file
    
    This is useful for code that tries to figure out the primary arch's
    $libdir on the local system, given that is different on the various
    Linuxes.

diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in
index f8bccb5..786b1cf 100644
--- a/src/core/systemd.pc.in
+++ b/src/core/systemd.pc.in
@@ -7,6 +7,7 @@
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
+libdir=@libdir@
 systemdutildir=@rootlibexecdir@
 systemdsystemunitdir=@systemunitdir@
 systemdsystempresetdir=@systempresetdir@