Use new variable NLSPATH.

diff --git a/config/Makefile.am b/config/Makefile.am
index 8082726722a1bbf7bfdd222c1ef236594c8a82c2..3f0346d32446e2ece56be230bdc90ec59536d8af 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}@ \
            <$< >$@
 

diff --git a/etc/afpd/Makefile.am b/etc/afpd/Makefile.am
index 3f025198195a556494858729bbd600f155d728d2..9644ff24b4af72f6bf8839466a87c5f194dfd19f 100644 (file)
--- a/etc/afpd/Makefile.am
+++ b/etc/afpd/Makefile.am
@@ -1,6 +1,7 @@
 # Makefile.am for etc/afpd/
 
 pkgconfdir = @PKGCONFDIR@
+nlsdir = @NLSDIR@
 
 SUBDIRS = nls
 
@@ -32,6 +33,6 @@ CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/sys \
         -D_PATH_AFPDPWFILE=\"$(pkgconfdir)/afppasswd\" \
         -D_PATH_AFPDCONF=\"$(pkgconfdir)/afpd.conf\" \
         -D_PATH_AFPDUAMPATH=\"$(UAMS_PATH)/\" \
-        -D_PATH_AFPDNLSPATH=\"$(pkgconfdir)/nls/\" \
+        -D_PATH_AFPDNLSPATH=\"$(nlsdir)/\" \
         -DAFPD_MTAB_FILE=\"$(pkgconfdir)/afpd.mtab\" \
         -DAPPLCNAME

diff --git a/etc/afpd/nls/Makefile.am b/etc/afpd/nls/Makefile.am
index 46d5c6f22bf7dc66a1d26835af6d0cddad50ec38..9ce82ef838c41422307860f31a5ceb38654bf6fe 100644 (file)
--- a/etc/afpd/nls/Makefile.am
+++ b/etc/afpd/nls/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am for etc/afpd/nls/
 
 pkgconfdir = @PKGCONFDIR@
-nlsdir = $(pkgconfdir)/nls
+nlsdir = @NLSDIR@
 
 bin_PROGRAMS = makecode parsecode