Mercurial Mercurial > gadict / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Makefile
changeset 774 7e8a7ec72bb4
parent 773 3bf7e4c6233f
child 775 6aa817943828 
--- a/Makefile	Fri Mar 03 14:42:05 2017 +0200
+++ b/Makefile	Fri Mar 03 14:44:37 2017 +0200
@@ -157,7 +157,7 @@
 STAT_RST_FILE := dist/misc/STAT.rst
 STAT_HTML_FILE := dist/www/STAT.html
 
-HTML_FILES := $(RST_HTML_FILES) $(INDEX_HTML_FILE) $(STAT_HTML_FILE)
+WWW_HTML_FILES := $(RST_HTML_FILES) $(INDEX_HTML_FILE) $(STAT_HTML_FILE)
 
 LOGO_FILE := www/logo.svg
 LOGO_DIM := 32x32 48x48 64x64
@@ -240,10 +240,10 @@
 	hg push ssh://$(DEFUN_USER)@$(DEFUN_HG_SRV)/$(DEFUN_HG_DIR) || [ $$? = 1 ]
 
 .PHONY: deploy2defun-www
-deploy2defun-www: $(HTML_FILES) $(FAVICON)
+deploy2defun-www: $(WWW_HTML_FILES) $(FAVICON)
 	( \
 echo 'cd $(DEFUN_WWW_DIR)'; \
-for f in $(HTML_FILES) $(FAVICON); do \
+for f in $(WWW_HTML_FILES) $(FAVICON); do \
   n=$${f##*/}; \
   echo "put $$f $$n"; \
   echo "chmod 644 $$n"; \
@@ -280,9 +280,9 @@
 
 # Will be accessed via http://$(pkgname).sourceforge.net
 .PHONY: deploy2sf-www
-deploy2sf-www: $(HTML_FILES) $(FAVICON)
+deploy2sf-www: $(WWW_HTML_FILES) $(FAVICON)
 	( echo 'cd htdocs'; \
-for f in $(HTML_FILES) $(FAVICON); do \
+for f in $(WWW_HTML_FILES) $(FAVICON); do \
   n=$${f##*/}; \
   echo "put $$f $$n"; \
   echo "chmod 644 $$n"; \
@@ -338,15 +338,15 @@
 DISTREL_DICTDZ_FILES := $(patsubst %,dist/$(fullpkgname)/dictd/%,$(notdir $(DICTDZ_FILES)))
 DISTREL_INDEX_FILES := $(patsubst %,dist/$(fullpkgname)/dictd/%,$(notdir $(INDEX_FILES)))
 DISTREL_RST_FILES := $(patsubst %,dist/$(fullpkgname)/doc/txt/%,$(notdir $(RST_FILES)))
-DISTREL_HTML_FILES := $(patsubst %,dist/$(fullpkgname)/doc/html/%,$(notdir $(RST_HTML_FILES)))
+DISTREL_WWW_HTML_FILES := $(patsubst %,dist/$(fullpkgname)/doc/html/%,$(notdir $(RST_HTML_FILES)))
 DISTREL_SRS_TAB_FILES := $(patsubst %,dist/$(fullpkgname)/srs/%,$(notdir $(SRS_TAB_FILES)))
 DISTREL_SRS_ANKI_FILES := $(patsubst %,dist/$(fullpkgname)/anki/%,$(notdir $(SRS_ANKI_FILES)))
 
-dist/$(fullpkgname).tar.gz: $(DISTREL_DICTDZ_FILES) $(DISTREL_INDEX_FILES) $(DISTREL_SRS_TAB_FILES) $(DISTREL_SRS_ANKI_FILES) $(DISTREL_RST_FILES) $(DISTREL_HTML_FILES) $(BUILD_SCRIPTS)
+dist/$(fullpkgname).tar.gz: $(DISTREL_DICTDZ_FILES) $(DISTREL_INDEX_FILES) $(DISTREL_SRS_TAB_FILES) $(DISTREL_SRS_ANKI_FILES) $(DISTREL_RST_FILES) $(DISTREL_WWW_HTML_FILES) $(BUILD_SCRIPTS)
 	rm -rf $@
 	tar zcf $@ -C dist/ $(fullpkgname)
 
-dist/$(fullpkgname).zip: $(DISTREL_DICTDZ_FILES) $(DISTREL_INDEX_FILES) $(DISTREL_RST_FILES) $(DISTREL_HTML_FILES) $(BUILD_SCRIPTS)
+dist/$(fullpkgname).zip: $(DISTREL_DICTDZ_FILES) $(DISTREL_INDEX_FILES) $(DISTREL_RST_FILES) $(DISTREL_WWW_HTML_FILES) $(BUILD_SCRIPTS)
 	rm -rf $@
 	cd $(dir $@) && zip -r $(notdir $@) $(fullpkgname)
 
@@ -362,7 +362,7 @@
 $(DISTREL_RST_FILES): dist/$(fullpkgname)/doc/txt/%: www/% | dist/$(fullpkgname)/doc/txt/
 	cp $< $@
 
-$(DISTREL_HTML_FILES): dist/$(fullpkgname)/doc/html/%: dist/www/% | dist/$(fullpkgname)/doc/html/
+$(DISTREL_WWW_HTML_FILES): dist/$(fullpkgname)/doc/html/%: dist/www/% | dist/$(fullpkgname)/doc/html/
 	cp $< $@
 
 $(patsubst %,dist/$(fullpkgname)/%, dictd/ srs/ anki/ doc/txt/ doc/html/):
@@ -602,7 +602,7 @@
 docs web: www
 
 .PHONY: www
-www: $(HTML_FILES)
+www: $(WWW_HTML_FILES)
 
 $(INDEX_HTML_FILE): dist/www/README.html
 	cp $< $@
gadict