ChangeSet ID: 11211419320183999921000613
CVSROOT: /cvsroot/wine
Module name: docs
Changes by: dimi(a)sc8-pr-cvs1.sourceforge.net 2005/07/11 21:18:52
Modified files:
. : Make.rules.in
en : Makefile.in
fr : Makefile.in
Log message:
Francois Gouget <fgouget(a)codeweavers.com>
Rename LANG to DOCLOCALE to avoid messing with the $LANG environment
variable of the commands started by make.
Old revision New revision Changes Path
1.6 1.7 +6 -6 docs/Make.rules.in
1.3 1.4 +1 -1 docs/en/Makefile.in
1.5 1.6 +1 -1 docs/fr/Makefile.in
Index: docs/Make.rules.in
diff -u -p docs/Make.rules.in:1.6 docs/Make.rules.in:1.7
--- docs/Make.rules.in 12 Jul 2005 4:18:52 -0000
+++ /dev/null 12 Jul 2005 4:18:52 -0000
@@ -1,7 +1,7 @@
# Global rules shared by all makefiles -*-Makefile-*-
#
# Each individual makefile should define the following variables:
-# LANG : the language for the documentation
+# DOCLOCALE : the language for the documentation
# ALLBOOKS : the books to build
# WINExxx_SRCS : the SGML source files for each supported book
@@ -50,18 +50,18 @@ clean:: $(SUBDIRS:%=%/__clean__)
# Rules for distribution tarballs of formatted docs
-dist: wine-doc-$(LANG)-ps.tar.gz wine-doc-$(LANG)-pdf.tar.gz wine-doc-$(LANG)-html.tar.gz wine-doc-$(LANG)-txt.tar.gz
+dist: wine-doc-$(DOCLOCALE)-ps.tar.gz wine-doc-$(DOCLOCALE)-pdf.tar.gz wine-doc-$(DOCLOCALE)-html.tar.gz wine-doc-$(DOCLOCALE)-txt.tar.gz
-wine-doc-$(LANG)-ps.tar.gz: $(ALLBOOKS:%=%.ps)
+wine-doc-$(DOCLOCALE)-ps.tar.gz: $(ALLBOOKS:%=%.ps)
tar cf - $(ALLBOOKS:%=%.ps) | gzip -9 > $@ || ($(RM) $@ && false)
-wine-doc-$(LANG)-pdf.tar.gz: $(ALLBOOKS:%=%.pdf)
+wine-doc-$(DOCLOCALE)-pdf.tar.gz: $(ALLBOOKS:%=%.pdf)
tar cf - $(ALLBOOKS:%=%.pdf) | gzip -9 > $@ || ($(RM) $@ && false)
-wine-doc-$(LANG)-html.tar.gz: $(ALLBOOKS:%=%.html)
+wine-doc-$(DOCLOCALE)-html.tar.gz: $(ALLBOOKS:%=%.html)
tar cf - $(ALLBOOKS:%=%.html) | gzip -9 > $@ || ($(RM) $@ && false)
-wine-doc-$(LANG)-txt.tar.gz: $(ALLBOOKS:%=%.txt)
+wine-doc-$(DOCLOCALE)-txt.tar.gz: $(ALLBOOKS:%=%.txt)
tar cf - $(ALLBOOKS:%=%.txt) | gzip -9 > $@ || ($(RM) $@ && false)
# Directory recursion
Index: docs/en/Makefile.in
diff -u -p docs/en/Makefile.in:1.3 docs/en/Makefile.in:1.4
--- docs/en/Makefile.in 12 Jul 2005 4:18:52 -0000
+++ /dev/null 12 Jul 2005 4:18:52 -0000
@@ -3,7 +3,7 @@ TOPOBJDIR = ..
SRCDIR = @srcdir@
VPATH = @srcdir@
-LANG = en
+DOCLOCALE = en
WINEUSR_SRCS = \
wineusr-bugs.sgml \
Index: docs/fr/Makefile.in
diff -u -p docs/fr/Makefile.in:1.5 docs/fr/Makefile.in:1.6
--- docs/fr/Makefile.in 12 Jul 2005 4:18:52 -0000
+++ /dev/null 12 Jul 2005 4:18:52 -0000
@@ -3,7 +3,7 @@ TOPOBJDIR = ..
SRCDIR = @srcdir@
VPATH = @srcdir@
-LANG = fr
+DOCLOCALE = fr
SGMLDIR = $(TOPSRCDIR)/en
MIN_TRANS = 1