X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=3025c65ad28008ab82cdb3795e1b9191849aef46;hb=96408316212ad291aa1986a1bc91e682404cdb04;hp=cd9ed60a9db8c898e4932b3f4ed5e3d5685d0707;hpb=f25b623eb0a6543630c876af7b87885a62edc1a6;p=elogind.git diff --git a/Makefile.am b/Makefile.am index cd9ed60a9..3025c65ad 100644 --- a/Makefile.am +++ b/Makefile.am @@ -158,7 +158,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 +646,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 = \