X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=nls%2Ffr_FR%2FMakefile.am;h=9e881cfcef4a33f3ce17934710e5bfd97e3fd34a;hb=24d14b5f322206ac56854ffcf61b76aee2729f25;hp=441095535771df6e9fca51d48b4631ab26398c8f;hpb=dfc5f034581f5a26cba5c4811500438f89f0634a;p=chaz%2Fopenbox

diff --git a/nls/fr_FR/Makefile.am b/nls/fr_FR/Makefile.am
index 44109553..9e881cfc 100644
--- a/nls/fr_FR/Makefile.am
+++ b/nls/fr_FR/Makefile.am
@@ -1,36 +1,38 @@
-# nls/fr_FR/Makefile.am for Openbox
+# Makefile.am for Blackbox - an X11 Window Manager
 
 NLSTEST = @NLS@
+THE_LANG = fr_FR
+THE_NLS_PATH = $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)
 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: openbox.cat
 install-data-local: openbox.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) openbox.cat $(DESTDIR)$(pkgdatadir)/nls/fr_FR; \
+	@if test x$(NLSTEST) = "xyes"; then \
+		echo "Installing catalog in $(THE_NLS_PATH)"; \
+		$(mkinstalldirs) $(THE_NLS_PATH); \
+		$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
 		rm -f $(DESTDIR)$(pkgdatadir)/nls/fr; \
-		ln -f -s fr_FR $(DESTDIR)$(pkgdatadir)/nls/fr; \
+                ln -f -s fr_FR $(DESTDIR)$(pkgdatadir)/nls/fr; \
 	fi
 uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/fr_FR/openbox.cat; \
+	@if test x$(NLSTEST) = "xyes"; then \
+		rm -f $(THE_NLS_PATH)/openbox.cat; \
 		rm -f $(DESTDIR)$(pkgdatadir)/nls/fr; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/fr_FR; \
+		rmdir $(THE_NLS_PATH); \
 	fi
 
 Translation.m: $(MFILES)
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
 	fi
 
 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 *\~ .\#*