all repos — fluxbox @ 3172279d104738a72352739c07bf658aa0324d03

custom fork of the fluxbox windowmanager 

locale path
fluxgen fluxgen
commit

3172279d104738a72352739c07bf658aa0324d03

parent

6a10833ff5847cc2958911b06328608e58ca0c5c

22 files changed, 128 insertions(+), 106 deletions(-)

jump to
M nls/C/Makefile.am → nls/C/Makefile.am 
@@ -2,6 +2,7 @@ # nls/C/Makefile.am for Fluxbox - www.fluxbox.org
 
 THE_LANG = C
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in 

@@ -11,15 +12,15 @@
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 fluxbox.cat: Translation.m
M nls/Makefile.am → nls/Makefile.am 
@@ -1,5 +1,6 @@
 # nls/Makefile.am for fluxbox - http://fluxbox.sf.net
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 SUBDIRS = C cs_CZ da_DK es_ES et_EE fr_FR pt_BR ru_RU \
 		  sv_SE tr_TR it_IT pt_PT bg_BG ja_JP ko_KR \

@@ -11,7 +12,7 @@ BUILT_SOURCES=fluxbox-nls.hh
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls; \
+		rmdir $(DESTDIR)$(LOCALE_PATH); \
 	fi
 distclean-local:
 	rm -f *\~
M nls/bg_BG/Makefile.am → nls/bg_BG/Makefile.am 
@@ -2,6 +2,7 @@ # nls/bg_BG/Makefile.am for Fluxbox - www.fluxbox.org
 
 THE_LANG = bg_BG
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in 

@@ -11,15 +12,15 @@
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 fluxbox.cat: Translation.m
M nls/cs_CZ/Makefile.am → nls/cs_CZ/Makefile.am 
@@ -2,6 +2,7 @@ # nls/cs_CZ/Makefile.am for Fluxbox - www.fluxbox.org
 
 THE_LANG = cs_CZ
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in 

@@ -11,15 +12,15 @@
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 fluxbox.cat: Translation.m
M nls/da_DK/Makefile.am → nls/da_DK/Makefile.am 
@@ -2,6 +2,7 @@ # nls/da_DK/Makefile.am for Fluxbox - www.fluxbox.org
 
 THE_LANG = da_DK
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in 

@@ -11,15 +12,15 @@
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 fluxbox.cat: Translation.m
M nls/de_DE/Makefile.am → nls/de_DE/Makefile.am 
@@ -2,6 +2,7 @@ # nls/de_DE/Makefile.am for Fluxbox - www.fluxbox.org
 
 THE_LANG = de_DE
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in 

@@ -11,15 +12,15 @@
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 fluxbox.cat: Translation.m
M nls/es_ES/Makefile.am → nls/es_ES/Makefile.am 
@@ -2,6 +2,7 @@ # nls/es_ES/Makefile.am for Fluxbox - www.fluxbox.org
 
 THE_LANG = es_ES
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in 

@@ -11,15 +12,15 @@
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 fluxbox.cat: Translation.m
M nls/et_EE/Makefile.am → nls/et_EE/Makefile.am 
@@ -2,6 +2,7 @@ # nls/et_EE/Makefile.am for Fluxbox - www.fluxbox.org
 
 THE_LANG = et_EE
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in 

@@ -11,15 +12,15 @@
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 fluxbox.cat: Translation.m
M nls/fr_FR/Makefile.am → nls/fr_FR/Makefile.am 
@@ -2,6 +2,7 @@ # nls/fr_FR/Makefile.am for Fluxbox - www.fluxbox.org
 
 THE_LANG = fr_FR
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in 

@@ -11,15 +12,15 @@
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 fluxbox.cat: Translation.m
M nls/it_IT/Makefile.am → nls/it_IT/Makefile.am 
@@ -2,6 +2,7 @@ # nls/it_IT/Makefile.am for Fluxbox - www.fluxbox.org
 
 THE_LANG = it_IT
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in 

@@ -11,15 +12,15 @@
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 fluxbox.cat: Translation.m
M nls/ja_JP/Makefile.am → nls/ja_JP/Makefile.am 
@@ -2,6 +2,7 @@ # nls/ja_JP/Makefile.am for Fluxbox - www.fluxbox.org
 
 THE_LANG = ja_JP
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in 

@@ -11,15 +12,15 @@
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 fluxbox.cat: Translation.m
M nls/ko_KR/Makefile.am → nls/ko_KR/Makefile.am 
@@ -2,6 +2,7 @@ # nls/ko_KR/Makefile.am for Fluxbox - www.fluxbox.org
 
 THE_LANG = ko_KR
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in 

@@ -11,15 +12,15 @@
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 fluxbox.cat: Translation.m
M nls/lv_LV/Makefile.am → nls/lv_LV/Makefile.am 
@@ -2,6 +2,7 @@ # nls/lv_LV/Makefile.am for Fluxbox - www.fluxbox.org
 
 THE_LANG = lv_LV
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in 

@@ -11,15 +12,15 @@
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 fluxbox.cat: Translation.m
M nls/nl_NL/Makefile.am → nls/nl_NL/Makefile.am 
@@ -2,6 +2,7 @@ # nls/nl_NL/Makefile.am for Fluxbox - www.fluxbox.org
 
 THE_LANG = nl_NL
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in 

@@ -11,15 +12,15 @@
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 fluxbox.cat: Translation.m
M nls/pl_PL/Makefile.am → nls/pl_PL/Makefile.am 
@@ -2,6 +2,7 @@ # nls/pl_PL/Makefile.am for Fluxbox - www.fluxbox.org
 
 THE_LANG = pl_PL
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in 

@@ -11,15 +12,15 @@
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 fluxbox.cat: Translation.m
M nls/pt_BR/Makefile.am → nls/pt_BR/Makefile.am 
@@ -2,6 +2,7 @@ # nls/pt_BR/Makefile.am for Fluxbox - www.fluxbox.org
 
 THE_LANG = pt_BR
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in 

@@ -11,15 +12,15 @@
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 fluxbox.cat: Translation.m
M nls/pt_PT/Makefile.am → nls/pt_PT/Makefile.am 
@@ -2,6 +2,7 @@ # nls/pt_PT/Makefile.am for Fluxbox - www.fluxbox.org
 
 THE_LANG = pt_PT
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in 

@@ -11,15 +12,15 @@
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 fluxbox.cat: Translation.m
M nls/ru_RU/Makefile.am → nls/ru_RU/Makefile.am 
@@ -2,6 +2,7 @@ # nls/ru_RU/Makefile.am for Fluxbox - www.fluxbox.org
 
 THE_LANG = ru_RU
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in 

@@ -11,15 +12,15 @@
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 fluxbox.cat: Translation.m
M nls/sl_SI/Makefile.am → nls/sl_SI/Makefile.am 
@@ -2,6 +2,7 @@ # nls/sl_SI/Makefile.am for Fluxbox - www.fluxbox.org
 
 THE_LANG = sl_SI
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in 

@@ -11,15 +12,15 @@
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 fluxbox.cat: Translation.m
M nls/sv_SE/Makefile.am → nls/sv_SE/Makefile.am 
@@ -2,6 +2,7 @@ # nls/sv_SE/Makefile.am for Fluxbox - www.fluxbox.org
 
 THE_LANG = sv_SE
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in 

@@ -11,15 +12,15 @@
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 fluxbox.cat: Translation.m
M nls/tr_TR/Makefile.am → nls/tr_TR/Makefile.am 
@@ -2,6 +2,7 @@ # nls/tr_TR/Makefile.am for Fluxbox - www.fluxbox.org
 
 THE_LANG = tr_TR
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in 

@@ -11,15 +12,15 @@
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 fluxbox.cat: Translation.m
M nls/vi_VN/Makefile.am → nls/vi_VN/Makefile.am 
@@ -2,6 +2,7 @@ # nls/vi_VN/Makefile.am for Fluxbox - www.fluxbox.org
 
 THE_LANG = vi_VN
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in 

@@ -11,15 +12,15 @@
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 fluxbox.cat: Translation.m