1 files changed, 17 insertions, 13 deletions

diff --git a/nls/et_EE/Makefile.am b/nls/et_EE/Makefile.am
index 6bd65a2..cb4a13c 100644
--- a/nls/et_EE/Makefile.am
+++ b/nls/et_EE/Makefile.am
@@ -1,29 +1,33 @@
-# nls/et_EE/Makefile.am for Blackbox-0.61.x - an X11 Window Manager
+# nls/et_EE/Makefile.am for Fluxbox - an X11 Window Manager
+
+THE_LANG = et_EE
+CODESET = ISO-8859-15
 
 NLSTEST = @NLS@
-CLEANFILES = blackbox.cat
+CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in Translation.m
-MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m blackbox.m common.m main.m bsetroot.m
+MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m fluxbox.m common.m main.m bsetroot.m
 EXTRA_DIST=$(MFILES)
-all-local: blackbox.cat
-install-data-local: blackbox.cat
+all-local: fluxbox.cat
+install-data-local: fluxbox.cat
         @if test x$(NLSTEST) = "x-DNLS"; then \
-                echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/et_EE"; \
-                $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/et_EE ; \
-                $(INSTALL_DATA) blackbox.cat $(DESTDIR)$(pkgdatadir)/nls/et_EE; \
+                echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
+                $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG) ; \
+                $(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
         fi
 uninstall-local:
         @if test x$(NLSTEST) = "x-DNLS"; then \
-                rm -f $(DESTDIR)$(pkgdatadir)/nls/et_EE/blackbox.cat; \
-                rmdir $(DESTDIR)$(pkgdatadir)/nls/et_EE; \
+                rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
+                rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
         fi
 
 Translation.m: $(MFILES)
         @if test x$(NLSTEST) = "x-DNLS"; then \
-                awk -f ../convert.awk output=Translation.m $(MFILES); \
+                rm -f Translation.m; \
+                awk -f ../convert.awk codeset=$(CODESET) output=Translation.m $(MFILES); \
         fi
 
-blackbox.cat: Translation.m
+fluxbox.cat: Translation.m
         @if test x$(NLSTEST) = "x-DNLS"; then \
-                $(gencat_cmd) blackbox.cat Translation.m; \
+                LANG=$(THE_LANG) $(gencat_cmd) fluxbox.cat Translation.m; \
         fi