chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
general: replace a few uses of /var/run by /run
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 371cc562e92bcb60776166f3bff0af6e85d8205c..7f8e22a6a3d589246097307556bbc2cad8b1274b 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-59,7
+59,7
@@
AM_CPPFLAGS = \
-DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
-DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \
-DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \
-DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
-DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \
-DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \
- -DRUNTIME_DIR=\"
$(localstatedir)
/run\" \
+ -DRUNTIME_DIR=\"/run\" \
-DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
-DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
-DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
-DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
-DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
-DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
@@
-114,6
+114,9
@@
bin_PROGRAMS = \
systemd-stdio-bridge \
systemd-nspawn
systemd-stdio-bridge \
systemd-nspawn
+dist_bin_SCRIPTS = \
+ src/systemd-analyze
+
if HAVE_GTK
bin_PROGRAMS += \
systemadm \
if HAVE_GTK
bin_PROGRAMS += \
systemadm \
@@
-1226,6
+1229,13
@@
CLEANFILES += \
$(dbusinterface_DATA)
install-data-hook:
$(dbusinterface_DATA)
install-data-hook:
+ $(MKDIR_P) -m 0755 \
+ $(DESTDIR)$(sysconfdir)/modules-load.d \
+ $(DESTDIR)$(tmpfilesdir) \
+ $(DESTDIR)$(sysconfdir)/sysctl.d \
+ $(DESTDIR)$(systemshutdowndir) \
+ $(DESTDIR)$(systemgeneratordir) \
+ $(DESTDIR)$(usergeneratordir)
$(MKDIR_P) -m 0755 \
$(DESTDIR)$(systemunitdir) \
$(DESTDIR)$(userunitdir) \
$(MKDIR_P) -m 0755 \
$(DESTDIR)$(systemunitdir) \
$(DESTDIR)$(userunitdir) \
@@
-1327,10
+1337,6
@@
install-data-hook:
$(LN_S) $(systemunitdir)/getty@.service getty@tty4.service && \
$(LN_S) $(systemunitdir)/getty@.service getty@tty5.service && \
$(LN_S) $(systemunitdir)/getty@.service getty@tty6.service )
$(LN_S) $(systemunitdir)/getty@.service getty@tty4.service && \
$(LN_S) $(systemunitdir)/getty@.service getty@tty5.service && \
$(LN_S) $(systemunitdir)/getty@.service getty@tty6.service )
- ( cd $(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants && \
- rm -f quotaon.service quotacheck.service && \
- $(LN_S) $(systemunitdir)/quotacheck.service quotacheck.service && \
- $(LN_S) $(systemunitdir)/quotaon.service quotaon.service )
( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
rm -f remote-fs.target && \
$(LN_S) $(systemunitdir)/remote-fs.target remote-fs.target )
( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
rm -f remote-fs.target && \
$(LN_S) $(systemunitdir)/remote-fs.target remote-fs.target )
@@
-1425,8
+1431,9
@@
if TARGET_MANDRIVA
rm -f halt-local.service && \
$(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
( cd $(DESTDIR)$(systemunitdir) && \
rm -f halt-local.service && \
$(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
( cd $(DESTDIR)$(systemunitdir) && \
- rm -f display-manager.service single.service && \
+ rm -f display-manager.service
dm.service
single.service && \
$(LN_S) prefdm.service display-manager.service && \
$(LN_S) prefdm.service display-manager.service && \
+ $(LN_S) prefdm.service dm.service && \
$(LN_S) rescue.service single.service )
( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
rm -f display-manager.service && \
$(LN_S) rescue.service single.service )
( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
rm -f display-manager.service && \