build-sys: properly mkdir with DESTDIR set

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 179b9b902d70d9367dce47f83254b8fd664e69c1..1b8ed92237ce6660456113445d89125930cd5185 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,27 +32,27 @@ SUBDIRS = . po
 .SECONDARY:
 
 LIBUDEV_CURRENT=4
-LIBUDEV_REVISION=3
+LIBUDEV_REVISION=4
 LIBUDEV_AGE=3
 
 LIBGUDEV_CURRENT=1
 LIBGUDEV_REVISION=3
 LIBGUDEV_AGE=1
 
-LIBSYSTEMD_LOGIN_CURRENT=6
+LIBSYSTEMD_LOGIN_CURRENT=7
 LIBSYSTEMD_LOGIN_REVISION=0
-LIBSYSTEMD_LOGIN_AGE=6
+LIBSYSTEMD_LOGIN_AGE=7
 
 LIBSYSTEMD_DAEMON_CURRENT=0
 LIBSYSTEMD_DAEMON_REVISION=10
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=21
+LIBSYSTEMD_ID128_REVISION=22
 LIBSYSTEMD_ID128_AGE=0
 
 LIBSYSTEMD_JOURNAL_CURRENT=10
-LIBSYSTEMD_JOURNAL_REVISION=0
+LIBSYSTEMD_JOURNAL_REVISION=1
 LIBSYSTEMD_JOURNAL_AGE=10
 
 # Dirs of external packages
@@ -138,12 +138,11 @@ udevlibexec_PROGRAMS =
 
 AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \
-       -DSYSTEM_CONFIG_FILE=\"$(pkgsysconfdir)/system.conf\" \
+       -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \
        -DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \
        -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \
        -DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" \
        -DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \
-       -DUSER_CONFIG_FILE=\"$(pkgsysconfdir)/user.conf\" \
        -DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \
        -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \
        -DCATALOG_DATABASE=\"$(catalogstatedir)/database\" \
@@ -245,7 +244,7 @@ install-aliases-hook:
                dir= && $(install-aliases)
 
 define install-aliases
-       $(MKDIR_P) /$(DESTDIR)$$dir && \
+       $(MKDIR_P) $(DESTDIR)$$dir && \
        while [ -n "$$1" ]; do \
                rm -f $(DESTDIR)$$dir/$$2 && \
                $(LN_S) $$1 $(DESTDIR)$$dir/$$2 && \
@@ -643,6 +642,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/fdset.h \
        src/shared/prioq.c \
        src/shared/prioq.h \
+       src/shared/sleep-config.c \
+       src/shared/sleep-config.h \
        src/shared/strv.c \
        src/shared/strv.h \
        src/shared/env-util.c \