makefiles: Hardcode the nls directory.

It's Wine-specific anyway.

configure

@@ -868,7 +868,6 @@ CFLAGS
 CC
 SET_MAKE
 srcdir
-nlsdir
 dlldir
 host_os
 host_vendor
@@ -4677,8 +4676,6 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 dlldir=\${libdir}/wine
 
-nlsdir=\${datadir}/wine/nls
-
 
 
 
@@ -23979,7 +23976,6 @@ host_cpu = $host_cpu
 host_vendor = $host_vendor
 host_os = $host_os
 dlldir = $dlldir
-nlsdir = $nlsdir
 srcdir = $srcdir
 SET_MAKE = $SET_MAKE
 CC = $CC

configure.ac

@@ -92,7 +92,6 @@ AC_ARG_WITH(wine64,    AS_HELP_STRING([--with-wine64=DIR],[use the 64-bit Wine i
 AC_CANONICAL_HOST
 
 AC_SUBST(dlldir,[\${libdir}/wine])
-AC_SUBST(nlsdir,[\${datadir}/wine/nls])
 AC_SUBST(srcdir)
 
 dnl **** Check for some programs ****

server/Makefile.in

@@ -49,4 +49,4 @@ SOURCES = \
 
 UNIX_LIBS = $(LDEXECFLAGS) $(RT_LIBS) $(INOTIFY_LIBS) $(PROCSTAT_LIBS)
 
-unicode_EXTRADEFS = -DNLSDIR="\"${nlsdir}\"" -DBIN_TO_NLSDIR=\"`${MAKEDEP} -R ${bindir} ${nlsdir}`\"
+unicode_EXTRADEFS = -DNLSDIR="\"${datadir}/wine/nls\"" -DBIN_TO_NLSDIR=\"`${MAKEDEP} -R ${bindir} ${datadir}/wine/nls`\"

tools/makedep.c

@@ -2664,7 +2664,7 @@ static struct strarray get_removable_dirs( struct strarray files )
 static void output_uninstall_rules( struct makefile *make )
 {
     static const char *dirs_order[] =
-        { "$(includedir)", "$(mandir)", "$(nlsdir)", "$(datadir)", "$(dlldir)" };
+        { "$(includedir)", "$(mandir)", "$(datadir)", "$(dlldir)" };
 
     struct strarray uninstall_dirs;
     unsigned int i, j;
@@ -3042,7 +3042,7 @@ static void output_source_svg( struct makefile *make, struct incl_file *source,
 static void output_source_nls( struct makefile *make, struct incl_file *source, const char *obj )
 {
     add_install_rule( make, source->name, 0, source->name,
-                      strmake( "D$(nlsdir)/%s", source->name ));
+                      strmake( "D$(datadir)/wine/nls/%s", source->name ));
     output_srcdir_symlink( make, strmake( "%s.nls", obj ));
 }
 

tools/wmc/Makefile.in

@@ -12,7 +12,7 @@ SOURCES = \
 	write.c
 
 wmc_EXTRADEFS = \
-	-DNLSDIR="\"${nlsdir}\"" \
-	-DBIN_TO_NLSDIR=\"`${MAKEDEP} -R ${bindir} ${nlsdir}`\"
+	-DNLSDIR="\"${datadir}/wine/nls\"" \
+	-DBIN_TO_NLSDIR=\"`${MAKEDEP} -R ${bindir} ${datadir}/wine/nls`\"
 
 INSTALL_DEV = $(PROGRAMS)

tools/wrc/Makefile.in

@@ -15,9 +15,9 @@ SOURCES = \
 	wrc.man.in
 
 wrc_EXTRADEFS = \
-	-DNLSDIR="\"${nlsdir}\"" \
+	-DNLSDIR="\"${datadir}/wine/nls\"" \
 	-DINCLUDEDIR="\"${includedir}\"" \
-	-DBIN_TO_NLSDIR=\"`${MAKEDEP} -R ${bindir} ${nlsdir}`\" \
+	-DBIN_TO_NLSDIR=\"`${MAKEDEP} -R ${bindir} ${datadir}/wine/nls`\" \
 	-DBIN_TO_INCLUDEDIR=\"`${MAKEDEP} -R ${bindir} ${includedir}`\"
 
 INSTALL_DEV = $(PROGRAMS)