systemd-analyze: use specified binary, add --version

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b11dfb95efe564bb2051091828209db7ae0f9263..e81998d3b20261b09c9f7b7b6fb3a2f784615f23 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -142,7 +142,6 @@ AM_CPPFLAGS = \
        -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \
        -DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \
        -DROOTPREFIX=\"$(rootprefix)\" \
-       -DRUNTIME_DIR=\"/run\" \
        -DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
        -DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
        -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
@@ -184,9 +183,6 @@ bin_PROGRAMS = \
        systemd-detect-virt \
        systemd-delta
 
-dist_bin_SCRIPTS = \
-       src/analyze/systemd-analyze
-
 rootlibexec_PROGRAMS = \
        systemd \
        systemd-cgroups-agent \
@@ -212,6 +208,15 @@ systemgenerator_PROGRAMS = \
        systemd-fstab-generator \
        systemd-system-update-generator
 
+dist_bin_SCRIPTS = \
+       src/analyze/systemd-analyze
+
+EXTRA_DIST += \
+       src/analyze/systemd-analyze.in
+
+CLEANFILES += \
+       src/analyze/systemd-analyze
+
 dist_bashcompletion_DATA = \
        shell-completion/systemd-bash-completion.sh
 
@@ -3798,6 +3803,8 @@ SED_PROCESS = \
                -e 's,@VARLOGDIR\@,$(varlogdir),g' \
                -e 's,@RC_LOCAL_SCRIPT_PATH_START\@,$(RC_LOCAL_SCRIPT_PATH_START),g' \
                -e 's,@RC_LOCAL_SCRIPT_PATH_STOP\@,$(RC_LOCAL_SCRIPT_PATH_STOP),g' \
+               -e 's,@PYTHON\@,$(PYTHON),g' \
+               -e 's,@PYTHON_BINARY\@,$(PYTHON_BINARY),g' \
                < $< > $@
 
 units/%: units/%.in Makefile
@@ -3825,6 +3832,10 @@ src/%.policy.in: src/%.policy.in.in Makefile
        $(SED_PROCESS)
        $(AM_V_GEN)chmod +x $@
 
+src/analyze/systemd-analyze: %: %.in Makefile
+       $(SED_PROCESS)
+       $(AM_V_GEN)chmod +x $@
+
 src/%.c: src/%.gperf
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GEN)$(GPERF) < $< > $@
@@ -4062,24 +4073,6 @@ if HAVE_KMOD
                $(LN_S) ../systemd-modules-load.service systemd-modules-load.service )
 endif
 
-
-if TARGET_FEDORA
-       ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f display-manager.service single.service && \
-               $(LN_S) rescue.service single.service )
-endif
-
-if TARGET_MANDRIVA
-       ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f display-manager.service dm.service single.service && \
-               $(LN_S) rescue.service single.service )
-endif
-
-if TARGET_MAGEIA
-       ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f display-manager.service )
-endif
-
 install-exec-hook: $(INSTALL_EXEC_HOOKS)
 
 uninstall-hook: $(UNINSTALL_DATA_HOOKS) $(UNINSTALL_EXEC_HOOKS)
@@ -4115,11 +4108,11 @@ DISTCHECK_CONFIGURE_FLAGS += \
 endif
 
 hwdb-update:
-       ( cd hwdb && \
-       wget -N http://www.linux-usb.org/usb.ids && \
-       wget -N http://pci-ids.ucw.cz/v2.2/pci.ids && \
-       wget -N http://standards.ieee.org/develop/regauth/oui/oui.txt && \
-       wget -N http://standards.ieee.org/develop/regauth/iab/iab.txt && \
+       ( cd $(top_srcdir)/hwdb && \
+       wget -N http://www.linux-usb.org/usb.ids \
+               http://pci-ids.ucw.cz/v2.2/pci.ids \
+               http://standards.ieee.org/develop/regauth/oui/oui.txt \
+               http://standards.ieee.org/develop/regauth/iab/iab.txt && \
        ./ids-update.pl )
 
 upload: all distcheck