From: Mark Hansen <mark@markhansen.co.nz>
Date: Tue, 2 Mar 2021 07:30:53 +0000 (+0000)
Subject: Merge branch 'lang-2' into 'master'
X-Git-Tag: 2.47.0~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c6930291128b875045218d06483fc6af2127afea;p=graphviz

Merge branch 'lang-2' into 'master'

Remove lang.html.j2: it's migrated repos

See merge request graphviz/graphviz!1820
---

c6930291128b875045218d06483fc6af2127afea
diff --cc doc/infosrc/Makefile
index be0702355,1ba878701..c63dc084e
--- a/doc/infosrc/Makefile
+++ b/doc/infosrc/Makefile
@@@ -82,9 -81,9 +81,9 @@@ A2GIF= aa_box.gif aa_lbox.gif aa_rbox.g
  
  GIF = $(SGIF) $(AGIF) $(MGIF) $(A2GIF) $(XGIF)
  DOTS = html2.gv html3.gv html4.gv tee.gv
- HTML = colors.html lang.html shapes.html \
+ HTML = colors.html grammar.html shapes.html \
         arrows.html schema.html
 -MISC = graphviz_json_schema.json w3data.js
 +MISC = graphviz_json_schema.json
  INSTALL_FILES = $(HTML) $(DOTS) $(SGIF) $(AGIF) $(A2GIF) $(MGIF) $(XGIF) $(MPNG) $(MISC)
  
  .SUFFIXES: .gv .gif .dot .png
@@@ -132,15 -144,11 +131,13 @@@ shapes : shapelist mkshapes.s
  	./mkshapes.sh
  	touch shapes
   
 -shapes.html : shapes mkshhtml.py html.html record.gif record2.gif sdlshapes.png templates/shapes.html.j2 shapelist
 -	./mkshhtml.py html.html < shapelist > shapes.html
 +shapes.html : shapes mkshhtml.py record.gif record2.gif sdlshapes.png templates/shapes.html.j2 shapelist html_grammar html1.gif html2.gif html3.gif html4.gif mklang
 +	./mklang html_grammar gramtmp
 +	./mkshhtml.py gramtmp html1.dot < shapelist > shapes.html
 +	rm gramtmp
  
- lang.html : grammar mklang mklang.py
- 	./mklang grammar gramtmp
- 	./mklang.py gramtmp > lang.html
- 	rm gramtmp
+ grammar.html : grammar mklang
+ 	./mklang grammar grammar.html
  
  arrows.html : arrow_grammar arrows.1 arrows.2 mkarrowtbl.sh mklang $(AGIF) $(A2GIF)
  	./mklang arrow_grammar gramtmp