move of_findname key from filename to dev, inode.

[netatalk.git] / config / Makefile.am

diff --git a/config/Makefile.am b/config/Makefile.am
index c77ed56b5cea86731114dc68163a0c388c00e1c7..c12cc92d03095855db951766087123d56bc0fc9a 100644 (file)
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -14,6 +14,7 @@ EXTRA_DIST = $(CONFFILES) $(TMPLFILES) $(PAMFILES)
 CLEANFILES = $(GENFILES)
 
 pkgconfdir = @PKGCONFDIR@
+nlsdir = @NLSDIR@
 
 #
 # rule to parse template files
@@ -21,7 +22,7 @@ pkgconfdir = @PKGCONFDIR@
 
 .tmpl:
        sed -e s@:UAMS_PATH:@${UAMS_PATH}@ \
-           -e s@:NLS_PATH:@${pkgconfdir}/nls@ \
+           -e s@:NLS_PATH:@${nlsdir}@ \
            -e s@:ETCDIR:@${pkgconfdir}@ \
            <$< >$@
 
@@ -46,12 +47,12 @@ install-config-files: $(CONFFILES) $(GENFILES)
 
 if USE_PAM
 
-pamdir = $(sysconfdir)/pam.d
+pamdir = @PAMDIR@/etc/pam.d
 
 install-data-local: install-config-files $(PAMFILES)
        $(mkinstalldirs) $(DESTDIR)$(pamdir)
-       for f in $(PAMFILES); do \
-               $(INSTALL_DATA) $$f $(DESTDIR)$(pamdir)/netatalk; \
+       for f in $(PAMFILES); do                                        \
+               $(INSTALL_DATA) $$f $(DESTDIR)$(pamdir)/netatalk || echo "WARNING: Can't install PAM files";            \
        done
 
 else