latex2e-help-texinfo-fr (19nov16)

git-svn-id: svn://tug.org/texlive/trunk@42541 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 9 insertions, 7 deletions

diff --git a/Master/texmf-dist/doc/latex/latex2e-help-texinfo-fr/Makefile b/Master/texmf-dist/doc/latex/latex2e-help-texinfo-fr/Makefile
index 5112d14ccb8..eaa9ec00a06 100644
--- a/Master/texmf-dist/doc/latex/latex2e-help-texinfo-fr/Makefile
+++ b/Master/texmf-dist/doc/latex/latex2e-help-texinfo-fr/Makefile
@@ -190,7 +190,9 @@ realclean maintainer-clean: distclean
 
 #  dist for CTAN.  Also update NEWS
 # 
-txt_files = ChangeLog Makefile.1 NEWS README ltx-help.el
+define txt_files
+ChangeLog Makefile.1 license.texi $(subst -$(default_language),,NEWS-$(1) README-$(1)) ltx-help.el
+endef
 
 define dist_output
 $($(1)_makeinfo_output) $(addprefix $($(1)_manual).,pdf texi) aspell.$(1).pws
@@ -208,7 +210,7 @@ endef
 define lang_template
 .PHONY: dist-$(1)
 dist-$(1): updated-$(1)
-	@uncommited=`svn status $(call dist_output,$(1)) $(txt_files)`; \
+	@uncommited=`svn status $$(call dist_output,$(1)) $$(call txt_files,$(1))`; \
 	echo -n "$$$$uncommited"; \
 	if [ -n "$$$$uncommited" -a -z "$(DIST_FORCE)" ]; \
 	then \
@@ -220,7 +222,7 @@ dist-$(1): updated-$(1)
 	fi
 	@echo ""
 	rm -fr $(dist-$(1))
-	$(call make_dist_dir,$(dist-$(1)),$(1),..,$(txt_files))
+	$$(call make_dist_dir,$(dist-$(1)),$(1),..,$$(call txt_files,$(1)))
 	-zip -qr $(dist-$(1)).zip $(dist-$(1)) 
 	rm -fr $(dist-$(1))
 	@ls -l $(dist-$(1)).zip; unzip -t $(dist-$(1)).zip
@@ -233,7 +235,7 @@ dist = $(manual)-help-texinfo
 #
 .PHONY: dist
 dist: all
-	@uncommited=`svn status $(foreach lang,$(languages),$(call dist_output,$(lang))) $(txt_files)`; \
+	@uncommited=`svn status $(foreach lang,$(languages),$(call dist_output,$(lang)) $(call txt_files,$(lang)))`; \
 	echo -n "$$uncommited"; \
 	if [ -n "$$uncommited" -a -z "$(DIST_FORCE)" ]; \
 	then \
@@ -245,7 +247,7 @@ dist: all
 	fi
 	@echo ""
 	rm -fr $(dist)
-	$(call make_dist_dir,$(dist),$(default_language),..,$(txt_files))
+	$(call make_dist_dir,$(dist),$(default_language),..,$(call txt_files,$(default_language)))
 	$(foreach lang,$(other_languages), \
 		$(call make_dist_dir,$(dist)/$($(lang)_longname),$(lang),../..,))
 	-zip -qr $(dist).zip $(dist)
@@ -262,7 +264,7 @@ spell: $(addprefix spell-,$(languages))
 define lang_template
 .PHONY: spell-$(1)
 spell-$(1):
-	sed -e 's/\\[a-zA-z]*//g' $($(1)_manual).texi \
+	sed -e 's/\\[a-zA-Z]*//g' $($(1)_manual).texi \
 	| aspell list --mode=texinfo --add-extra-dicts=`pwd`/aspell.$(1).pws \
         | sort -f -u
 endef
@@ -311,7 +313,7 @@ endif
 svr:
 	svn revert $(addprefix $(manual)*., $(all_suffixes))
 svd:
-	svn diff $(txt_files) $(patsubst %,aspell.%.pws,$(languages)) *.texi
+	svn diff $(foreach lang,$(languages),$(call txt_files,$(lang))) $(patsubst %,aspell.%.pws,$(languages)) *.texi
 
 # Local Variables:
 # coding: utf-8