build-sys: fix ntp-units.d path creation

[thirdparty/systemd.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3eeb842afe6edc39135c2a4bfe458f4be6a9f47f..e6bfc1f39e927bfd1dc1bdee1bc5c7d2ec481280 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2353,6 +2353,18 @@ journalctl_LDADD = \
        libsystemd-id128-internal.la \
        libsystemd-logs.la
 
+if HAVE_QRENCODE
+journalctl_SOURCES += \
+       src/journal/journal-qrcode.c \
+       src/journal/journal-qrcode.h
+
+journalctl_CFLAGS += \
+       $(QRENCODE_CFLAGS)
+
+journalctl_LDADD += \
+       $(QRENCODE_LIBS)
+endif
+
 test_journal_SOURCES = \
        src/journal/test-journal.c
 
@@ -2402,8 +2414,6 @@ libsystemd_journal_la_SOURCES = \
        src/journal/journal-vacuum.h \
        src/journal/journal-verify.c \
        src/journal/journal-verify.h \
-       src/journal/journal-authenticate.c \
-       src/journal/journal-authenticate.h \
        src/journal/lookup3.c \
        src/journal/lookup3.h \
        src/journal/journal-send.c \
@@ -2455,6 +2465,8 @@ endif
 
 if HAVE_GCRYPT
 libsystemd_journal_la_SOURCES += \
+       src/journal/journal-authenticate.c \
+       src/journal/journal-authenticate.h \
        src/journal/fsprg.c \
        src/journal/fsprg.h
 
@@ -3021,8 +3033,8 @@ dbusinterface_DATA += \
 
 timedated-install-data-hook:
        $(MKDIR_P) -m 0755 \
-               $(DESTDIR)$(prefix)/lib/ntp-units.d \
-               $(DESTDIR)$(sysconfdir)/ntp-units.d
+               $(DESTDIR)$(prefix)/lib/systemd/ntp-units.d \
+               $(DESTDIR)$(sysconfdir)/systemd/ntp-units.d
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f dbus-org.freedesktop.timedate1.service  && \
                $(LN_S) systemd-timedated.service dbus-org.freedesktop.timedate1.service )