Commit 7269801a authored by Denis Barbier's avatar Denis Barbier

In dependencies, remove $(HTMLDEP), which was never used, and

add $(GETTEXTDEP).

CVS version numbers

Makefile.common: 1.66 -> 1.67 
chinese/Make.lang: 1.33 -> 1.34
parent ff4055b9
......@@ -11,6 +11,11 @@ TEMPLDIR := $(ENGLISHDIR)/template/debian
RELHTMLBASE := ../../www
HTMLDIR = $(WMLBASE)/$(RELHTMLBASE)/$(CUR_DIR)
LOCALEDIR := $(WMLBASE)/../locale/$(LANGUAGE)/LC_MESSAGES
ifneq "$(LANGUAGE)" "en"
GETTEXTDEP := $(LOCALEDIR)/templates.mo
endif
LANGUAGECAP = $(shell echo $(LANGUAGE) | tr "a-z" "A-Z")
WMLOPTIONS := -q -D CUR_YEAR=$(CUR_YEAR)
WMLOUTFILE = $(@F)
......@@ -79,16 +84,16 @@ endif
ifndef NOGENERICDEP
ifeq "$(findstring /CD,$(CURDIR))" ""
%.$(LANGUAGE).html : %.wml $(WMLBASE)/../.wmlrc $(WMLBASE)/.wmlrc \
$(TEMPLDIR)/template.wml $(TEMPLDIR)/languages.wml $(HTMLDEP)
$(TEMPLDIR)/template.wml $(TEMPLDIR)/languages.wml $(GETTEXTDEP)
$(WML) $(<F)
else
ifeq "$(findstring /CD/vendors,$(CURDIR))" ""
%.$(LANGUAGE).html : %.wml $(WMLBASE)/../.wmlrc $(WMLBASE)/.wmlrc \
$(TEMPLDIR)/cdimage.wml $(HTMLDEP)
$(TEMPLDIR)/cdimage.wml $(GETTEXTDEP)
$(WML) $(<F)
else
%.$(LANGUAGE).html : %.wml $(WMLBASE)/../.wmlrc $(WMLBASE)/.wmlrc \
$(TEMPLDIR)/template.wml $(TEMPLDIR)/languages.wml $(HTMLDEP)
$(TEMPLDIR)/template.wml $(TEMPLDIR)/languages.wml $(GETTEXTDEP)
$(WML) $(<F)
endif
endif
......
......@@ -90,19 +90,9 @@ $(HTMLDIR)/%.zh-tw.html: %.zh-tw.html
ifndef NOGENERICDEP
%.zh-cn.html %.zh-hk.html %.zh-tw.html: %.wml \
$(TEMPLDIR)/template.wml $(TEMPLDIR)/languages.wml \
$(TOCN) $(TOHK) $(TOTW) $(ZHTEMPLATE) $(HTMLDEP) \
$(TOCN) $(TOHK) $(TOTW) $(ZHTEMPLATE) $(GETTEXTDEP) \
$(COMMONPICS_ZH)
$(WML) $(<F)
# # *.imgdot-1x1-transp.gif are evil! Get rid of them!
# # Must set nullglob or else the following fails - foka, June 2000
@shopt -s nullglob; \
for i in *.imgdot-1x1-transp.gif; do \
rm -f $$i; \
j=`basename $$i .imgdot-1x1-transp.gif` ; \
for k in $$j.$(LANGUAGE)-??.html.tmp; do \
perl -pi -e "s|$$j\\.(?=imgdot-1x1-transp\\.gif)|$(WMLBASE)/Pics/|g" $$k; \
done; \
done
@echo -n " * Converting: [zh_CN.GB2312], "
@$(B5TOGB) < $*.zh-cn.html.tmp > $*.zh-cn.html
@rm -f $*.zh-cn.html.tmp
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment