chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hwdb: use $(localstatedir)/lib/udev/hwdb.bin for the binary database
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 42fed59641e26550d3b88c22d7982c2c3382169a..1f30ba8cb86b5ae34280a9f28ef089c7c6551de6 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-63,6
+63,10
@@
bashcompletiondir=$(sysconfdir)/bash_completion.d
rpmmacrosdir=$(sysconfdir)/rpm
sysvinitdir=$(SYSTEM_SYSVINIT_PATH)
varlogdir=$(localstatedir)/log
rpmmacrosdir=$(sysconfdir)/rpm
sysvinitdir=$(SYSTEM_SYSVINIT_PATH)
varlogdir=$(localstatedir)/log
+systemdstatedir=$(localstatedir)/lib/systemd
+catalogstatedir=$(systemdstatedir)/catalog
+udevstatedir=$(localstatedir)/lib/udev
+hwdb_bin=$(udevstatedir)/hwdb.bin
# Our own, non-special dirs
pkgsysconfdir=$(sysconfdir)/systemd
# Our own, non-special dirs
pkgsysconfdir=$(sysconfdir)/systemd
@@
-78,9
+82,10
@@
systemsleepdir=$(rootlibexecdir)/system-sleep
systemunitdir=$(rootprefix)/lib/systemd/system
systempresetdir=$(rootprefix)/lib/systemd/system-preset
udevlibexecdir=$(rootprefix)/lib/udev
systemunitdir=$(rootprefix)/lib/systemd/system
systempresetdir=$(rootprefix)/lib/systemd/system-preset
udevlibexecdir=$(rootprefix)/lib/udev
-udevhomedir = $(udevlibexecdir)
-udevrulesdir = $(udevlibexecdir)/rules.d
-udevhwdbdir = $(udevlibexecdir)/hwdb.d
+udevhomedir=$(udevlibexecdir)
+udevrulesdir=$(udevlibexecdir)/rules.d
+udevhwdbdir=$(udevlibexecdir)/hwdb.d
+catalogdir=$(prefix)/lib/systemd/catalog
# And these are the special ones for /
rootprefix=@rootprefix@
# And these are the special ones for /
rootprefix=@rootprefix@
@@
-93,6
+98,7
@@
BUILT_SOURCES =
INSTALL_EXEC_HOOKS =
UNINSTALL_EXEC_HOOKS =
INSTALL_DATA_HOOKS =
INSTALL_EXEC_HOOKS =
UNINSTALL_EXEC_HOOKS =
INSTALL_DATA_HOOKS =
+UNINSTALL_DATA_HOOKS =
DISTCLEAN_LOCAL_HOOKS =
pkginclude_HEADERS =
noinst_LTLIBRARIES =
DISTCLEAN_LOCAL_HOOKS =
pkginclude_HEADERS =
noinst_LTLIBRARIES =
@@
-125,6
+131,8
@@
AM_CPPFLAGS = \
-DUSER_CONFIG_FILE=\"$(pkgsysconfdir)/user.conf\" \
-DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \
-DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \
-DUSER_CONFIG_FILE=\"$(pkgsysconfdir)/user.conf\" \
-DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \
-DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \
+ -DCATALOG_PATH=\"$(catalogstatedir)\" \
+ -DHWDB_BIN=\"$(hwdb_bin)\" \
-DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
-DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" \
-DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
-DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
-DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" \
-DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
@@
-1480,7
+1488,7
@@
systemd_detect_virt_LDADD = \
libsystemd-shared.la
systemd-detect-virt-install-hook:
libsystemd-shared.la
systemd-detect-virt-install-hook:
- $(SETCAP) cap_dac_override,cap_sys_ptrace=ep $(DESTDIR)$(bindir)/systemd-detect-virt ||:
+ -$(SETCAP) cap_dac_override,cap_sys_ptrace=ep $(DESTDIR)$(bindir)/systemd-detect-virt
INSTALL_EXEC_HOOKS += \
systemd-detect-virt-install-hook
INSTALL_EXEC_HOOKS += \
systemd-detect-virt-install-hook
@@
-1892,7
+1900,6
@@
libudev_core_la_SOURCES = \
src/udev/udev-rules.c \
src/udev/udev-ctrl.c \
src/udev/udev-builtin.c \
src/udev/udev-rules.c \
src/udev/udev-ctrl.c \
src/udev/udev-builtin.c \
- src/udev/udev-builtin-blkid.c \
src/udev/udev-builtin-btrfs.c \
src/udev/udev-builtin-firmware.c \
src/udev/udev-builtin-hwdb.c \
src/udev/udev-builtin-btrfs.c \
src/udev/udev-builtin-firmware.c \
src/udev/udev-builtin-hwdb.c \
@@
-1919,6
+1926,11
@@
libudev_core_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
-DFIRMWARE_PATH="$(FIRMWARE_PATH)"
$(AM_CPPFLAGS) \
-DFIRMWARE_PATH="$(FIRMWARE_PATH)"
+if HAVE_BLKID
+libudev_core_la_SOURCES += \
+ src/udev/udev-builtin-blkid.c
+endif
+
if HAVE_ACL
libudev_core_la_SOURCES += \
src/udev/udev-builtin-uaccess.c \
if HAVE_ACL
libudev_core_la_SOURCES += \
src/udev/udev-builtin-uaccess.c \
@@
-1950,6
+1962,17
@@
udevadm_LDADD = \
libudev-core.la \
libsystemd-shared.la
libudev-core.la \
libsystemd-shared.la
+# Update hwdb on installation. Do not bother if installing
+# in DESTDIR, since this is likely for packaging purposes.
+hwdb-update-hook:
+ -test -n "$(DESTDIR)" || $(bindir)/udevadm hwdb --update
+
+INSTALL_DATA_HOOKS += \
+ hwdb-update-hook
+
+hwdb-remove-hook:
+ -test -n "$(DESTDIR)" || rm -f $(HWDB_BIN)
+
# ------------------------------------------------------------------------------
TESTS += \
test/udev-test.pl \
# ------------------------------------------------------------------------------
TESTS += \
test/udev-test.pl \
@@
-2565,6
+2588,15
@@
test_mmap_cache_LDADD = \
libsystemd-shared.la \
libsystemd-journal-internal.la
libsystemd-shared.la \
libsystemd-journal-internal.la
+test_catalog_SOURCES = \
+ src/journal/test-catalog.c
+
+test_catalog_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-label.la \
+ libsystemd-journal-internal.la \
+ libsystemd-id128-internal.la
+
libsystemd_journal_la_SOURCES = \
src/journal/sd-journal.c \
src/systemd/sd-journal.h \
libsystemd_journal_la_SOURCES = \
src/journal/sd-journal.c \
src/systemd/sd-journal.h \
@@
-2579,6
+2611,8
@@
libsystemd_journal_la_SOURCES = \
src/journal/journal-send.c \
src/journal/journal-def.h \
src/journal/compress.h \
src/journal/journal-send.c \
src/journal/journal-def.h \
src/journal/compress.h \
+ src/journal/catalog.c \
+ src/journal/catalog.h \
src/journal/mmap-cache.c \
src/journal/mmap-cache.h
src/journal/mmap-cache.c \
src/journal/mmap-cache.h
@@
-2594,6
+2628,7
@@
libsystemd_journal_la_LDFLAGS = \
libsystemd_journal_la_LIBADD = \
libsystemd-shared.la \
libsystemd_journal_la_LIBADD = \
libsystemd-shared.la \
+ libsystemd-label.la \
libsystemd-id128-internal.la
libsystemd_journal_internal_la_SOURCES = \
libsystemd-id128-internal.la
libsystemd_journal_internal_la_SOURCES = \
@@
-2621,7
+2656,9
@@
libsystemd_journal_internal_la_LIBADD = \
libsystemd-label.la \
libsystemd-audit.la \
libsystemd-daemon.la \
libsystemd-label.la \
libsystemd-audit.la \
libsystemd-daemon.la \
- libudev.la
+ libudev.la \
+ libsystemd-shared.la \
+ libsystemd-label.la
nodist_libsystemd_journal_internal_la_SOURCES = \
src/journal/journald-gperf.c
nodist_libsystemd_journal_internal_la_SOURCES = \
src/journal/journald-gperf.c
@@
-2695,6
+2732,20
@@
libsystemd-journal-uninstall-hook:
UNINSTALL_EXEC_HOOKS += \
libsystemd-journal-uninstall-hook
UNINSTALL_EXEC_HOOKS += \
libsystemd-journal-uninstall-hook
+# Update catalog on installation. Do not bother if installing
+# in DESTDIR, since this is likely for packaging purposes.
+catalog-update-hook:
+ -test -n "$(DESTDIR)" || $(rootbindir)/journalctl --update-catalog
+
+INSTALL_DATA_HOOKS += \
+ catalog-update-hook
+
+catalog-remove-hook:
+ -test -n "$(DESTDIR)" || rm -f $(catalogstatedir)/database
+
+UNINSTALL_DATA_HOOKS += \
+ catalog-remove-hook
+
noinst_PROGRAMS += \
test-journal \
test-journal-send \
noinst_PROGRAMS += \
test-journal \
test-journal-send \
@@
-2703,7
+2754,8
@@
noinst_PROGRAMS += \
test-journal-enum \
test-journal-stream \
test-journal-verify \
test-journal-enum \
test-journal-stream \
test-journal-verify \
- test-mmap-cache
+ test-mmap-cache \
+ test-catalog
TESTS += \
test-journal \
TESTS += \
test-journal \
@@
-2747,6
+2799,9
@@
dist_pkgsysconf_DATA += \
pkgconfiglib_DATA += \
src/journal/libsystemd-journal.pc
pkgconfiglib_DATA += \
src/journal/libsystemd-journal.pc
+dist_catalog_DATA = \
+ catalog/systemd.catalog
+
journal-install-data-hook:
$(MKDIR_P) -m 0755 \
$(DESTDIR)$(systemunitdir)/sockets.target.wants \
journal-install-data-hook:
$(MKDIR_P) -m 0755 \
$(DESTDIR)$(systemunitdir)/sockets.target.wants \
@@
-3557,7
+3612,7
@@
polkitpolicy_files += \
logind-install-data-hook:
$(MKDIR_P) -m 0755 \
$(DESTDIR)$(systemunitdir)/multi-user.target.wants \
logind-install-data-hook:
$(MKDIR_P) -m 0755 \
$(DESTDIR)$(systemunitdir)/multi-user.target.wants \
- $(DESTDIR)$(
localstatedir)/lib/systemd
+ $(DESTDIR)$(
systemdstatedir)
( cd $(DESTDIR)$(systemunitdir) && \
rm -f dbus-org.freedesktop.login1.service && \
$(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service)
( cd $(DESTDIR)$(systemunitdir) && \
rm -f dbus-org.freedesktop.login1.service && \
$(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service)
@@
-3711,6
+3766,11
@@
SED_PROCESS = \
-e 's,@userunitdir\@,$(userunitdir),g' \
-e 's,@systempresetdir\@,$(systempresetdir),g' \
-e 's,@userpresetdir\@,$(userpresetdir),g' \
-e 's,@userunitdir\@,$(userunitdir),g' \
-e 's,@systempresetdir\@,$(systempresetdir),g' \
-e 's,@userpresetdir\@,$(userpresetdir),g' \
+ -e 's,@udevhwdbdir\@,$(udevhwdbdir),g' \
+ -e 's,@udevrulesdir\@,$(udevrulesdir),g' \
+ -e 's,@catalogdir\@,$(catalogdir),g' \
+ -e 's,@tmpfilesdir\@,$(tmpfilesdir),g' \
+ -e 's,@sysctldir\@,$(sysctldir),g' \
-e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
-e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
-e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \
-e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
-e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
-e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \
@@
-4017,7
+4077,7
@@
endif
install-exec-hook: $(INSTALL_EXEC_HOOKS)
install-exec-hook: $(INSTALL_EXEC_HOOKS)
-uninstall-hook: $(UNINSTALL_EXEC_HOOKS)
+uninstall-hook: $(UNINSTALL_
DATA_HOOKS) $(UNINSTALL_
EXEC_HOOKS)
install-data-hook: systemd-install-data-hook $(INSTALL_DATA_HOOKS)
install-data-hook: systemd-install-data-hook $(INSTALL_DATA_HOOKS)