Remove more vestigial configureac printouts

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index cd9ed60a9db8c898e4932b3f4ed5e3d5685d0707..67f57eb6618ebca77f00cd5bce1ad0e60a7d9bd7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -149,7 +149,6 @@ AM_CPPFLAGS = \
        -DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \
        -DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \
        -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \
-       -DCERTIFICATE_ROOT=\"$(CERTIFICATEROOT)\" \
        -DCATALOG_DATABASE=\"$(catalogstatedir)/database\" \
        -DROOTPREFIX=\"$(rootprefix)\" \
        -DRANDOM_SEED_DIR=\"$(localstatedir)/lib/elogind/\" \
@@ -158,7 +157,6 @@ AM_CPPFLAGS = \
        -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \
        -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
        -DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\" \
-       -DELOGIND_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
        -DELOGIND_LANGUAGE_FALLBACK_MAP=\"$(pkgdatadir)/language-fallback-map\" \
        -DX_SERVER=\"$(bindir)/X\" \
        -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
@@ -647,8 +645,7 @@ src/shared/cap-from-name.h: src/shared/cap-from-name.gperf
        $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_capability -H hash_capability_name -p -C <$< >$@
 
 # ------------------------------------------------------------------------------
-dist_factory_etc_DATA = \
-       factory/etc/nsswitch.conf
+dist_factory_etc_DATA =
 
 if HAVE_PAM
 dist_factory_pam_DATA = \
@@ -979,7 +976,6 @@ substitutions = \
        '|sysctldir=$(sysctldir)|' \
        '|systemgeneratordir=$(systemgeneratordir)|' \
        '|usergeneratordir=$(usergeneratordir)|' \
-       '|CERTIFICATEROOT=$(CERTIFICATEROOT)|' \
        '|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \
        '|PACKAGE_NAME=$(PACKAGE_NAME)|' \
        '|PACKAGE_URL=$(PACKAGE_URL)|' \
@@ -999,7 +995,6 @@ substitutions = \
        '|PYTHON_BINARY=$(PYTHON_BINARY)|' \
        '|systemuidmax=$(SYSTEM_UID_MAX)|' \
        '|systemgidmax=$(SYSTEM_GID_MAX)|' \
-       '|TTY_GID=$(TTY_GID)|' \
        '|systemsleepdir=$(systemsleepdir)|' \
        '|systemshutdowndir=$(systemshutdowndir)|' \
        '|binfmtdir=$(binfmtdir)|' \