remove gcc warnings and cleanup inline mess

[netatalk.git] / config / Makefile.am

diff --git a/config/Makefile.am b/config/Makefile.am
index 8f898a04ee0301bbefa3f981aebbd185a0a85be5..2b62afbca5a7c5f216443d4e7053eb89a6955396 100644 (file)
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -2,9 +2,9 @@
 
 SUFFIXES = .tmpl .
 
-GENFILES = afpd.conf
-TMPLFILES = $(foreach file,$(GENFILES),$(file).tmpl)
-CONFFILES = AppleVolumes.default AppleVolumes.system \
+GENFILES = afpd.conf AppleVolumes.default
+TMPLFILES = afpd.conf.tmpl AppleVolumes.default.tmpl
+CONFFILES = AppleVolumes.system \
        atalkd.conf netatalk.conf papd.conf
 PAMFILES = netatalk.pamd
 OVERWRITE_CONFIG = @OVERWRITE_CONFIG@
@@ -14,7 +14,6 @@ EXTRA_DIST = $(CONFFILES) $(TMPLFILES) $(PAMFILES)
 CLEANFILES = $(GENFILES)
 
 pkgconfdir = @PKGCONFDIR@
-nlsdir = @NLSDIR@
 
 #
 # rule to parse template files
@@ -22,8 +21,9 @@ nlsdir = @NLSDIR@
 
 .tmpl:
        sed -e s@:UAMS_PATH:@${UAMS_PATH}@ \
-           -e s@:NLS_PATH:@${nlsdir}@ \
            -e s@:ETCDIR:@${pkgconfdir}@ \
+           -e s@:COMPILED_BACKENDS:@"$(compiled_backends)"@ \
+           -e s@:DEFAULT_CNID_SCHEME:@$(DEFAULT_CNID_SCHEME)@ \
            <$< >$@
 
 #