Do not install aliases for units.

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d56edec2ea79f092c58a2d8027e8aae48065dfab..7e7f29a210440944b83d952597c7a0dbf7a03572 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -207,10 +207,6 @@ install-directories-hook:
        $(MKDIR_P) $(addprefix $(DESTDIR),$(INSTALL_DIRS))
 
 install-aliases-hook:
-       set -- $(SYSTEM_UNIT_ALIASES) && \
-               dir=$(systemunitdir) && $(install-aliases)
-       set -- $(USER_UNIT_ALIASES) && \
-               dir=$(userunitdir) && $(install-relative-aliases)
        set -- $(GENERAL_ALIASES) && \
                dir= && $(install-relative-aliases)
 
@@ -734,7 +730,7 @@ INSTALL_EXEC_HOOKS += libelogind-install-hook
 UNINSTALL_EXEC_HOOKS += libelogind-uninstall-hook
 
 pkgconfiglib_DATA += \
-       src/libelogind/libsystemd.pc
+       src/libelogind/libelogind.pc
 
 pkginclude_HEADERS += \
        src/systemd/sd-login.h
@@ -1094,26 +1090,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --disable-split-usr \
        --enable-kdbus
 
-DISTCHECK_CONFIGURE_FLAGS += \
-       --with-sysvinit-path= \
-       --with-sysvrcnd-path=
-
 if ENABLE_GTK_DOC
 DISTCHECK_CONFIGURE_FLAGS += \
        --enable-gtk-doc
 endif
-
-#
-# Require python when making dist
-#
-.PHONY: dist-check-help
-
-dist-check-help: $(rootbin_PROGRAMS) $(bin_PROGRAMS)
-       for i in $(abspath $^); do                                             \
-            if $$i  --help | grep -v 'default:' | grep -E -q '.{80}.' ; then   \
-               echo "$(basename $$i) --help output is too wide:";             \
-               $$i  --help | awk 'length > 80' | grep -E --color=yes '.{80}'; \
-               exit 1;                                                        \
-            fi; done
-
-dist: dist-check-python