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 6674611b21a7fb2eec87611fcfe9c37290a9b199..8ef4289488af6c9fb94b4f6766ffa08a5f040417 100644 (file)
--- a/nls/C/Makefile.am
+++ b/nls/C/Makefile.am
@@ -1,17 +1,17 @@
 # nls/C/Makefile.am for Blackbox - an X11 Window Manager
 
 NLSTEST = @NLS@
-CLEANFILES = blackbox.cat
+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@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m
 
-all-local: Translation.m blackbox.cat
-install-data-local: blackbox.cat
-       @if test x$(NLSTEST) = "x-DNLS"; then \
+all-local: Translation.m openbox.cat
+install-data-local: openbox.cat
+       @if test x$(NLSTEST) = "xyes"; then \
                echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/C"; \
                $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/C; \
-               $(INSTALL_DATA) blackbox.cat $(DESTDIR)$(pkgdatadir)/nls/C; \
+               $(INSTALL_DATA) openbox.cat $(DESTDIR)$(pkgdatadir)/nls/C; \
                rm -f $(DESTDIR)$(pkgdatadir)/nls/US_ASCII; \
                ln -f -ss C $(DESTDIR)$(pkgdatadir)/nls/US_ASCII; \
                rm -f $(DESTDIR)$(pkgdatadir)/nls/POSIX; \
@@ -24,8 +24,8 @@ install-data-local: blackbox.cat
                ln -f -s C $(DESTDIR)$(pkgdatadir)/nls/en; \
        fi
 uninstall-local:
-       @if test x$(NLSTEST) = "x-DNLS"; then \
-               rm -f $(DESTDIR)$(pkgdatadir)/nls/C/blackbox.cat; \
+       @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; \
                rm -f $(DESTDIR)$(pkgdatadir)/nls/en_US; \
@@ -41,10 +41,10 @@ Translation.m: $(MFILES)
        awk -f @srcdir@/../convert.awk header=../blackbox-nls.hh \
                output=Translation.m $(MFILES)
 
-blackbox.cat: Translation.m
-       @if test x$(NLSTEST) = "x-DNLS"; then \
-               $(gencat_cmd) blackbox.cat Translation.m; \
+openbox.cat: Translation.m
+       @if test x$(NLSTEST) = "xyes"; then \
+               $(gencat_cmd) openbox.cat Translation.m; \
        fi
 
 distclean-local:
-       rm -f *\~
+       rm -f *\~ .\#*