From cb16130192befaa7efb2c01db839a9e8a0649985 Mon Sep 17 00:00:00 2001
From: srittau <srittau>
Date: Thu, 17 Jan 2002 06:03:17 +0000
Subject: [PATCH] Use new variable NLSPATH.

---
 config/Makefile.am       | 3 ++-
 etc/afpd/Makefile.am     | 3 ++-
 etc/afpd/nls/Makefile.am | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/config/Makefile.am b/config/Makefile.am
index 80827267..3f0346d3 100644
--- 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 3f025198..9644ff24 100644
--- 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 46d5c6f2..9ce82ef8 100644
--- 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
 
-- 
2.39.2