1 files changed, 18 insertions, 14 deletions

diff --git a/nls/fr_FR/Makefile.am b/nls/fr_FR/Makefile.am
index 91c9f01..4f7f43f 100644
--- a/nls/fr_FR/Makefile.am
+++ b/nls/fr_FR/Makefile.am
@@ -1,33 +1,37 @@
-# nls/fr_FR/Makefile.am for Blackbox-0.61.x - an X11 Window Manager
+# nls/fr_FR/Makefile.am for Fluxbox - an X11 Window Manager
+
+THE_LANG = fr_FR
+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/fr_FR"; \
-                $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/fr_FR; \
-                $(INSTALL_DATA) blackbox.cat $(DESTDIR)$(pkgdatadir)/nls/fr_FR; \
+                echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
+                $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+                $(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
                 rm -f $(DESTDIR)$(pkgdatadir)/nls/fr; \
-                ln -fs fr_FR $(DESTDIR)$(pkgdatadir)/nls/fr; \
+                ln -fs $(THE_LANG) $(DESTDIR)$(pkgdatadir)/nls/fr; \
         fi
 uninstall-local:
         @if test x$(NLSTEST) = "x-DNLS"; then \
-                rm -f $(DESTDIR)$(pkgdatadir)/nls/fr_FR/blackbox.cat; \
+                rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
                 rm -f $(DESTDIR)$(pkgdatadir)/nls/fr; \
-                rmdir $(DESTDIR)$(pkgdatadir)/nls/fr_FR; \
+                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