Conversion of old nls files to new string names...

Change to new style of working.

1 files changed, 11 insertions, 26 deletions

diff --git a/nls/fr_FR/Makefile.am b/nls/fr_FR/Makefile.am
index 4f7f43f..74cb376 100644
--- a/nls/fr_FR/Makefile.am
+++ b/nls/fr_FR/Makefile.am
@@ -1,37 +1,22 @@
-# nls/fr_FR/Makefile.am for Fluxbox - an X11 Window Manager
+# nls/fr_FR/Makefile.am for Fluxbox - www.fluxbox.org
 
 THE_LANG = fr_FR
-CODESET = ISO-8859-15
 
 NLSTEST = @NLS@
 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 fluxbox.m common.m main.m bsetroot.m
-EXTRA_DIST=$(MFILES)
+MAINTAINERCLEANFILES = Makefile.in 
+MFILES = Translation.m
+EXTRA_DIST= $(MFILES)
 
 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); \
-                rm -f $(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/$(THE_LANG)/fluxbox.cat; \
-                rm -f $(DESTDIR)$(pkgdatadir)/nls/fr; \
-                rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-        fi
+        @if test x$(NLSTEST) = "x-DNLS"; then                 echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LA
+NG)";                 $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG);                 $(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LA
+NG);         fi
 
-Translation.m: $(MFILES)
-        @if test x$(NLSTEST) = "x-DNLS"; then \
-                rm -f Translation.m; \
-                awk -f ../convert.awk codeset=$(CODESET) output=Translation.m $(MFILES); \
-        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);         fi
 
 fluxbox.cat: Translation.m
-        @if test x$(NLSTEST) = "x-DNLS"; then \
-                LANG=$(THE_LANG) $(gencat_cmd) fluxbox.cat Translation.m; \
-        fi
+        @if test x$(NLSTEST) = "x-DNLS"; then                 $(gencat_cmd) fluxbox.cat Translation.m;         fi
+