syching with bb-cvs. rm .\#* on make dist-clean. nls updates.

[chaz/openbox] / nls / C / Makefile.am

diff --git a/nls/C/Makefile.am b/nls/C/Makefile.am
index 36ccd676c6a4e48a53640b2da025d215c7215b23..8ef4289488af6c9fb94b4f6766ffa08a5f040417 100644 (file)
--- a/nls/C/Makefile.am
+++ b/nls/C/Makefile.am
@@ -1,14 +1,14 @@
-# nls/C/Makefile.am for Openbox
+# nls/C/Makefile.am for Blackbox - an X11 Window Manager
 
 NLSTEST = @NLS@
 CLEANFILES = openbox.cat
 MAINTAINERCLEANFILES = Makefile.in Translation.m
 DISTCLEANFILES = Translation.m
-MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/openbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m
+MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m
 
 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; \
@@ -18,11 +18,13 @@ install-data-local: openbox.cat
                ln -f -s C $(DESTDIR)$(pkgdatadir)/nls/POSIX; \
                rm -f $(DESTDIR)$(pkgdatadir)/nls/en_US; \
                ln -f -s C $(DESTDIR)$(pkgdatadir)/nls/en_US; \
+               rm -f $(DESTDIR)$(pkgdatadir)/nls/en_GB; \
+               ln -f -s C $(DESTDIR)$(pkgdatadir)/nls/en_GB; \
                rm -f $(DESTDIR)$(pkgdatadir)/nls/en; \
                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; \
@@ -32,17 +34,17 @@ uninstall-local:
        fi
 
 # note... when adding new catalogs... you do not need the
-# header=../openbox-nls.h which is passed to awk... we
+# header=../blackbox-nls.hh which is passed to awk... we
 # only need to generate it once.
 
 Translation.m: $(MFILES)
-       awk -f @srcdir@/../convert.awk header=../openbox-nls.h \
+       awk -f @srcdir@/../convert.awk header=../blackbox-nls.hh \
                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
 
 distclean-local:
-       rm -f *\~
+       rm -f *\~ .\#*