X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=nls%2FC%2FMakefile.am;h=8ef4289488af6c9fb94b4f6766ffa08a5f040417;hb=7a55323343635d8a29bb62cd49d8d6a5c103f317;hp=97de4c63803fbe949e443852b02ff07a0fefb290;hpb=c2fee7f960bfbfb9692cbfa92cae149eb376f830;p=chaz%2Fopenbox

diff --git a/nls/C/Makefile.am b/nls/C/Makefile.am
index 97de4c63..8ef42894 100644
--- a/nls/C/Makefile.am
+++ b/nls/C/Makefile.am
@@ -1,35 +1,50 @@
-# Makefile.am for Blackbox - an X11 Window Manager
+# nls/C/Makefile.am for Blackbox - an X11 Window Manager
 
 NLSTEST = @NLS@
-THE_LANG = ru_RU
-THE_NLS_PATH = $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)
-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: blackbox.cat
-install-data-local: blackbox.cat
-	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(THE_NLS_PATH)"; \
-		$(mkinstalldirs) $(THE_NLS_PATH); \
-		$(INSTALL_DATA) blackbox.cat $(THE_NLS_PATH); \
+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) 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; \
+		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 \
-		rm -f $(THE_NLS_PATH)/blackbox.cat; \
-		rmdir $(THE_NLS_PATH); \
+	@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; \
+		rm -f $(DESTDIR)$(pkgdatadir)/nls/en; \
+		rmdir $(DESTDIR)$(pkgdatadir)/nls/C; \
 	fi
 
+# note... when adding new catalogs... you do not need the
+# header=../blackbox-nls.hh which is passed to awk... we
+# only need to generate it once.
+
 Translation.m: $(MFILES)
-	@if test x$(NLSTEST) = "x-DNLS"; then \
-		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-	fi
+	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 *\~ .\#*