re-added UnderMouse Placement

added NLS support in the new configure system.

19 files changed, 78 insertions, 78 deletions

diff --git a/nls/C/Makefile.am b/nls/C/Makefile.am
index 9c0c39ce..f13b6b84 100644
--- a/nls/C/Makefile.am
+++ b/nls/C/Makefile.am
@@ -8,7 +8,7 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
 
 all-local: Translation.m openbox.cat
 install-data-local: openbox.cat
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/C"; \
 		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/C; \
 		$(INSTALL_DATA) openbox.cat $(DESTDIR)$(pkgdatadir)/nls/C; \
@@ -24,7 +24,7 @@ install-data-local: openbox.cat
 		ln -f -s C $(DESTDIR)$(pkgdatadir)/nls/en; \
 	fi
 uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		rm -f $(DESTDIR)$(pkgdatadir)/nls/C/openbox.cat; \
 		rm -f $(DESTDIR)$(pkgdatadir)/nls/US_ASCII; \
 		rm -f $(DESTDIR)$(pkgdatadir)/nls/POSIX; \
@@ -42,7 +42,7 @@ Translation.m: $(MFILES)
 		output=Translation.m $(MFILES)
 
 openbox.cat: Translation.m
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		$(gencat_cmd) openbox.cat Translation.m; \
 	fi
 
diff --git a/nls/Makefile.am b/nls/Makefile.am
index 9b6c8fac..eb6fdc9e 100644
--- a/nls/Makefile.am
+++ b/nls/Makefile.am
@@ -7,7 +7,7 @@ MAINTAINERCLEANFILES = Makefile.in blackbox-nls.hh
 DISTCLEANFILES = blackbox-nls.hh
 
 uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		rmdir $(DESTDIR)$(pkgdatadir)/nls; \
 	fi
 distclean-local:
diff --git a/nls/da_DK/Makefile.am b/nls/da_DK/Makefile.am
index 1badc683..72eff11b 100644
--- a/nls/da_DK/Makefile.am
+++ b/nls/da_DK/Makefile.am
@@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
 
 all-local: openbox.cat
 install-data-local: openbox.cat
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		echo "Installing catalog in $(THE_NLS_PATH)"; \
 		$(mkinstalldirs) $(THE_NLS_PATH); \
 		$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
 	fi
 uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		rm -f $(THE_NLS_PATH)/openbox.cat; \
 		rmdir $(THE_NLS_PATH); \
 	fi
 
 Translation.m: $(MFILES)
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
 	fi
 
 openbox.cat: Translation.m
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		$(gencat_cmd) openbox.cat Translation.m; \
 	fi
 
diff --git a/nls/de_DE/Makefile.am b/nls/de_DE/Makefile.am
index 3bb95579..b4d883a5 100644
--- a/nls/de_DE/Makefile.am
+++ b/nls/de_DE/Makefile.am
@@ -10,7 +10,7 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
 
 all-local: openbox.cat
 install-data-local: openbox.cat
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		echo "Installing catalog in $(THE_NLS_PATH)"; \
 		$(mkinstalldirs) $(THE_NLS_PATH); \
 		$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
@@ -18,19 +18,19 @@ install-data-local: openbox.cat
                 ln -f -s de_DE $(DESTDIR)$(pkgdatadir)/nls/de; \
 	fi
 uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		rm -f $(THE_NLS_PATH)/openbox.cat; \
 		rm -f $(DESTDIR)$(pkgdatadir)/nls/de; \
 		rmdir $(THE_NLS_PATH); \
 	fi
 
 Translation.m: $(MFILES)
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
 	fi
 
 openbox.cat: Translation.m
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		$(gencat_cmd) openbox.cat Translation.m; \
 	fi
 
diff --git a/nls/es_ES/Makefile.am b/nls/es_ES/Makefile.am
index 0108edb9..fe6d2150 100644
--- a/nls/es_ES/Makefile.am
+++ b/nls/es_ES/Makefile.am
@@ -10,7 +10,7 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
 
 all-local: openbox.cat
 install-data-local: openbox.cat
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		echo "Installing catalog in $(THE_NLS_PATH)"; \
 		$(mkinstalldirs) $(THE_NLS_PATH); \
 		$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
@@ -18,19 +18,19 @@ install-data-local: openbox.cat
 		ln -f -s es_ES $(DESTDIR)$(pkgdatadir)/nls/es; \
 	fi
 uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		rm -f $(THE_NLS_PATH)/openbox.cat; \
 		rm -f $(DESTDIR)$(pkgdatadir)/nls/es; \
 		rmdir $(THE_NLS_PATH); \
 	fi
 
 Translation.m: $(MFILES)
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
 	fi
 
 openbox.cat: Translation.m
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		$(gencat_cmd) openbox.cat Translation.m; \
 	fi
 
diff --git a/nls/et_EE/Makefile.am b/nls/et_EE/Makefile.am
index 9364b753..43f549b4 100644
--- a/nls/et_EE/Makefile.am
+++ b/nls/et_EE/Makefile.am
@@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
 
 all-local: openbox.cat
 install-data-local: openbox.cat
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		echo "Installing catalog in $(THE_NLS_PATH)"; \
 		$(mkinstalldirs) $(THE_NLS_PATH); \
 		$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
 	fi
 uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		rm -f $(THE_NLS_PATH)/openbox.cat; \
 		rmdir $(THE_NLS_PATH); \
 	fi
 
 Translation.m: $(MFILES)
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
 	fi
 
 openbox.cat: Translation.m
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		$(gencat_cmd) openbox.cat Translation.m; \
 	fi
 
diff --git a/nls/fr_FR/Makefile.am b/nls/fr_FR/Makefile.am
index b407ab93..a1f27a31 100644
--- a/nls/fr_FR/Makefile.am
+++ b/nls/fr_FR/Makefile.am
@@ -10,7 +10,7 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
 
 all-local: openbox.cat
 install-data-local: openbox.cat
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		echo "Installing catalog in $(THE_NLS_PATH)"; \
 		$(mkinstalldirs) $(THE_NLS_PATH); \
 		$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
@@ -18,19 +18,19 @@ install-data-local: openbox.cat
                 ln -f -s fr_FR $(DESTDIR)$(pkgdatadir)/nls/fr; \
 	fi
 uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		rm -f $(THE_NLS_PATH)/openbox.cat; \
 		rm -f $(DESTDIR)$(pkgdatadir)/nls/fr; \
 		rmdir $(THE_NLS_PATH); \
 	fi
 
 Translation.m: $(MFILES)
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
 	fi
 
 openbox.cat: Translation.m
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		$(gencat_cmd) openbox.cat Translation.m; \
 	fi
 
diff --git a/nls/hu_HU/Makefile.am b/nls/hu_HU/Makefile.am
index b109c1af..a97c98ab 100644
--- a/nls/hu_HU/Makefile.am
+++ b/nls/hu_HU/Makefile.am
@@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
 
 all-local: openbox.cat
 install-data-local: openbox.cat
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		echo "Installing catalog in $(THE_NLS_PATH)"; \
 		$(mkinstalldirs) $(THE_NLS_PATH); \
 		$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
 	fi
 uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		rm -f $(THE_NLS_PATH)/openbox.cat; \
 		rmdir $(THE_NLS_PATH); \
 	fi
 
 Translation.m: $(MFILES)
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
 	fi
 
 openbox.cat: Translation.m
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		$(gencat_cmd) openbox.cat Translation.m; \
 	fi
 
diff --git a/nls/it_IT/Makefile.am b/nls/it_IT/Makefile.am
index a2a5988f..bea5101a 100644
--- a/nls/it_IT/Makefile.am
+++ b/nls/it_IT/Makefile.am
@@ -10,27 +10,27 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
 
 all-local: openbox.cat
 install-data-local: openbox.cat
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		echo "Installing catalog in $(THE_NLS_PATH)"; \
 		$(mkinstalldirs) $(THE_NLS_PATH); \
 		$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/it; \
-		ln -f -s it_IT $(DESTDIR)$(pkgdatadir)/nls/it; \
-	fi
+                rm -f $(DESTDIR)$(pkgdatadir)/nls/it; \
+                ln -f -s it_IT $(DESTDIR)$(pkgdatadir)/nls/it; \
+fi
 uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		rm -f $(THE_NLS_PATH)/openbox.cat; \
 		rm -f $(DESTDIR)$(pkgdatadir)/nls/it; \
 		rmdir $(THE_NLS_PATH); \
 	fi
 
 Translation.m: $(MFILES)
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
 	fi
 
 openbox.cat: Translation.m
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		$(gencat_cmd) openbox.cat Translation.m; \
 	fi
 
diff --git a/nls/ja_JP/Makefile.am b/nls/ja_JP/Makefile.am
index 46045a49..fcfcf633 100644
--- a/nls/ja_JP/Makefile.am
+++ b/nls/ja_JP/Makefile.am
@@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
 
 all-local: openbox.cat
 install-data-local: openbox.cat
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		echo "Installing catalog in $(THE_NLS_PATH)"; \
 		$(mkinstalldirs) $(THE_NLS_PATH); \
 		$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
 	fi
 uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		rm -f $(THE_NLS_PATH)/openbox.cat; \
 		rmdir $(THE_NLS_PATH); \
 	fi
 
 Translation.m: $(MFILES)
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
 	fi
 
 openbox.cat: Translation.m
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		$(gencat_cmd) openbox.cat Translation.m; \
 	fi
 
diff --git a/nls/nl_NL/Makefile.am b/nls/nl_NL/Makefile.am
index cade0ea4..177003ef 100644
--- a/nls/nl_NL/Makefile.am
+++ b/nls/nl_NL/Makefile.am
@@ -10,27 +10,27 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
 
 all-local: openbox.cat
 install-data-local: openbox.cat
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		echo "Installing catalog in $(THE_NLS_PATH)"; \
 		$(mkinstalldirs) $(THE_NLS_PATH); \
 		$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/nl; \
-		ln -f -s nl_NL $(DESTDIR)$(pkgdatadir)/nls/nl; \
-	fi
+                rm -f $(DESTDIR)$(pkgdatadir)/nls/nl; \
+                ln -f -s nl_NL $(DESTDIR)$(pkgdatadir)/nls/nl; \
+fi
 uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		rm -f $(THE_NLS_PATH)/openbox.cat; \
 		rm -f $(DESTDIR)$(pkgdatadir)/nls/nl; \
 		rmdir $(THE_NLS_PATH); \
 	fi
 
 Translation.m: $(MFILES)
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
 	fi
 
 openbox.cat: Translation.m
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		$(gencat_cmd) openbox.cat Translation.m; \
 	fi
 
diff --git a/nls/pt_BR/Makefile.am b/nls/pt_BR/Makefile.am
index c52861c1..957716d4 100644
--- a/nls/pt_BR/Makefile.am
+++ b/nls/pt_BR/Makefile.am
@@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
 
 all-local: openbox.cat
 install-data-local: openbox.cat
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		echo "Installing catalog in $(THE_NLS_PATH)"; \
 		$(mkinstalldirs) $(THE_NLS_PATH); \
 		$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
 	fi
 uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		rm -f $(THE_NLS_PATH)/openbox.cat; \
 		rmdir $(THE_NLS_PATH); \
 	fi
 
 Translation.m: $(MFILES)
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
 	fi
 
 openbox.cat: Translation.m
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		$(gencat_cmd) openbox.cat Translation.m; \
 	fi
 
diff --git a/nls/ru_RU/Makefile.am b/nls/ru_RU/Makefile.am
index b148c08a..f883f664 100644
--- a/nls/ru_RU/Makefile.am
+++ b/nls/ru_RU/Makefile.am
@@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
 
 all-local: openbox.cat
 install-data-local: openbox.cat
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		echo "Installing catalog in $(THE_NLS_PATH)"; \
 		$(mkinstalldirs) $(THE_NLS_PATH); \
 		$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
 	fi
 uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		rm -f $(THE_NLS_PATH)/openbox.cat; \
 		rmdir $(THE_NLS_PATH); \
 	fi
 
 Translation.m: $(MFILES)
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
 	fi
 
 openbox.cat: Translation.m
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		$(gencat_cmd) openbox.cat Translation.m; \
 	fi
 
diff --git a/nls/sl_SI/Makefile.am b/nls/sl_SI/Makefile.am
index f5ffde73..b006001e 100644
--- a/nls/sl_SI/Makefile.am
+++ b/nls/sl_SI/Makefile.am
@@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
 
 all-local: openbox.cat
 install-data-local: openbox.cat
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		echo "Installing catalog in $(THE_NLS_PATH)"; \
 		$(mkinstalldirs) $(THE_NLS_PATH); \
 		$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
 	fi
 uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		rm -f $(THE_NLS_PATH)/openbox.cat; \
 		rmdir $(THE_NLS_PATH); \
 	fi
 
 Translation.m: $(MFILES)
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
 	fi
 
 openbox.cat: Translation.m
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		$(gencat_cmd) openbox.cat Translation.m; \
 	fi
 
diff --git a/nls/sv_SE/Makefile.am b/nls/sv_SE/Makefile.am
index 647a6460..737625a9 100644
--- a/nls/sv_SE/Makefile.am
+++ b/nls/sv_SE/Makefile.am
@@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
 
 all-local: openbox.cat
 install-data-local: openbox.cat
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		echo "Installing catalog in $(THE_NLS_PATH)"; \
 		$(mkinstalldirs) $(THE_NLS_PATH); \
 		$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
 	fi
 uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		rm -f $(THE_NLS_PATH)/openbox.cat; \
 		rmdir $(THE_NLS_PATH); \
 	fi
 
 Translation.m: $(MFILES)
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
 	fi
 
 openbox.cat: Translation.m
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		$(gencat_cmd) openbox.cat Translation.m; \
 	fi
 
diff --git a/nls/tr_TR/Makefile.am b/nls/tr_TR/Makefile.am
index c28295d7..aa6c6ae4 100644
--- a/nls/tr_TR/Makefile.am
+++ b/nls/tr_TR/Makefile.am
@@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
 
 all-local: openbox.cat
 install-data-local: openbox.cat
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		echo "Installing catalog in $(THE_NLS_PATH)"; \
 		$(mkinstalldirs) $(THE_NLS_PATH); \
 		$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
 	fi
 uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		rm -f $(THE_NLS_PATH)/openbox.cat; \
 		rmdir $(THE_NLS_PATH); \
 	fi
 
 Translation.m: $(MFILES)
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
 	fi
 
 openbox.cat: Translation.m
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		$(gencat_cmd) openbox.cat Translation.m; \
 	fi
 
diff --git a/nls/uk_UA/Makefile.am b/nls/uk_UA/Makefile.am
index 7f799e97..059d8ccc 100644
--- a/nls/uk_UA/Makefile.am
+++ b/nls/uk_UA/Makefile.am
@@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
 
 all-local: openbox.cat
 install-data-local: openbox.cat
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		echo "Installing catalog in $(THE_NLS_PATH)"; \
 		$(mkinstalldirs) $(THE_NLS_PATH); \
 		$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
 	fi
 uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		rm -f $(THE_NLS_PATH)/openbox.cat; \
 		rmdir $(THE_NLS_PATH); \
 	fi
 
 Translation.m: $(MFILES)
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
 	fi
 
 openbox.cat: Translation.m
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		$(gencat_cmd) openbox.cat Translation.m; \
 	fi
 
diff --git a/nls/zh_CN/Makefile.am b/nls/zh_CN/Makefile.am
index 39400ec4..0fb4ee2a 100644
--- a/nls/zh_CN/Makefile.am
+++ b/nls/zh_CN/Makefile.am
@@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
 
 all-local: openbox.cat
 install-data-local: openbox.cat
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		echo "Installing catalog in $(THE_NLS_PATH)"; \
 		$(mkinstalldirs) $(THE_NLS_PATH); \
 		$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
 	fi
 uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		rm -f $(THE_NLS_PATH)/openbox.cat; \
 		rmdir $(THE_NLS_PATH); \
 	fi
 
 Translation.m: $(MFILES)
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
 	fi
 
 openbox.cat: Translation.m
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		$(gencat_cmd) openbox.cat Translation.m; \
 	fi
 
diff --git a/nls/zh_TW/Makefile.am b/nls/zh_TW/Makefile.am
index da4fb159..98bffb95 100644
--- a/nls/zh_TW/Makefile.am
+++ b/nls/zh_TW/Makefile.am
@@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
 
 all-local: openbox.cat
 install-data-local: openbox.cat
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		echo "Installing catalog in $(THE_NLS_PATH)"; \
 		$(mkinstalldirs) $(THE_NLS_PATH); \
 		$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
 	fi
 uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		rm -f $(THE_NLS_PATH)/openbox.cat; \
 		rmdir $(THE_NLS_PATH); \
 	fi
 
 Translation.m: $(MFILES)
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
 	fi
 
 openbox.cat: Translation.m
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		$(gencat_cmd) openbox.cat Translation.m; \
 	fi