asciidoc/Makefile.in in mizuho-0.9.6 vs asciidoc/Makefile.in in mizuho-0.9.8

@@ -5,32 +5,33 @@
 .NOTPARALLEL:
 
 INSTALL = @INSTALL@
 INSTALL_PROG = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
-
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
 SED = @SED@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 bindir = @bindir@
 datadir = @datadir@
+docdir = @docdir@
 sysconfdir = @sysconfdir@
 datarootdir = @datarootdir@
 mandir=@mandir@
 srcdir = @srcdir@
 
 VPATH = @srcdir@
 
 ASCIIDOCCONF = $(sysconfdir)/asciidoc
 
-prog = asciidoc.py a2x
+prog = asciidoc.py a2x.py
 progdir = $(bindir)
 
 vimdir = @sysconfdir@/vim
 
-manp = $(wildcard doc/*.1)
+manp = $(patsubst %1.txt,%1,$(wildcard doc/*.1.txt))
 manpdir = $(mandir)/man1
 
 conf = $(wildcard *.conf)
 confdir = $(ASCIIDOCCONF)
 
@@ -52,10 +53,15 @@
 musicfilterconfdir = $(filtersdir)/music
 
 sourcefilterconf = filters/source/source-highlight-filter.conf
 sourcefilterconfdir = $(filtersdir)/source
 
+latexfilter = filters/latex/latex2png.py
+latexfilterdir = $(filtersdir)/latex
+latexfilterconf = filters/latex/latex-filter.conf
+latexfilterconfdir = $(filtersdir)/latex
+
 docbook = $(wildcard docbook-xsl/*.xsl)
 docbookdir = $(ASCIIDOCCONF)/docbook-xsl
 
 dblatex = $(wildcard dblatex/*.xsl) $(wildcard dblatex/*.sty)
 dblatexdir = $(ASCIIDOCCONF)/dblatex
@@ -71,14 +77,13 @@
 
 icons = $(wildcard images/icons/*.png) images/icons/README
 iconsdir = $(ASCIIDOCCONF)/images/icons
 
 doc = $(wildcard README*) $(wildcard BUGS*) $(wildcard INSTALL*) $(wildcard CHANGELOG*)
-docdir = $(datadir)/doc/asciidoc
 
-DATATARGETS = manp conf docbook dblatex css js callouts icons codefilterconf musicfilterconf sourcefilterconf graphvizfilterconf
-PROGTARGETS = prog codefilter musicfilter graphvizfilter
+DATATARGETS = manp conf docbook dblatex css js callouts icons codefilterconf musicfilterconf sourcefilterconf graphvizfilterconf latexfilterconf
+PROGTARGETS = prog codefilter musicfilter graphvizfilter latexfilter
 TARGETS = $(DATATARGETS) $(PROGTARGETS) doc
 
 INSTDIRS = $(TARGETS:%=%dir)
 
 .PHONY: $(TARGETS)
@@ -93,10 +98,13 @@
 	$(INSTALL_PROG) $($@) $(DESTDIR)/$($<)/
 
 $(DATATARGETS): % : %dir
 	$(INSTALL_DATA) $($@) $(DESTDIR)/$($<)/
 
+$(manp): %.1 : %.1.txt
+	python a2x.py -f manpage $<
+
 docs:
 	$(INSTALL) -d $(DESTDIR)/$(docdir)
 	$(INSTALL_DATA) $(doc) $(DESTDIR)/$(docdir)
 	$(INSTALL) -d $(DESTDIR)/$(docdir)/docbook-xsl
 	$(INSTALL_DATA) docbook-xsl/asciidoc-docbook-xsl.txt $(DESTDIR)/$(docdir)/docbook-xsl
@@ -114,18 +122,20 @@
 		cp -R * $(DESTDIR)/$(docdir)/doc )
 	$(INSTALL) -d $(DESTDIR)/$(docdir)/examples/website
 	( cd examples/website && \
 		cp -R * $(DESTDIR)/$(docdir)/examples/website )
 
-renameprog:
-	(cd $(DESTDIR)/$(progdir); mv asciidoc.py asciidoc)
+progsymlink:
+	(cd $(DESTDIR)/$(progdir); ln -sf asciidoc.py asciidoc)
+	(cd $(DESTDIR)/$(progdir); ln -sf a2x.py a2x)
 
 fixconfpath:
 	@for f in $(prog); do \
 		echo "Fixing CONF_DIR in $$f"; \
-		$(SED) "s#^CONF_DIR = '.*'#CONF_DIR = '$(ASCIIDOCCONF)'#; s#^CONF_DIR=.*#CONF_DIR=$(ASCIIDOCCONF)#" $$f > $$f.out; \
+		$(SED) "s#^CONF_DIR = '.*'#CONF_DIR = '$(ASCIIDOCCONF)'#" $$f > $$f.out; \
 		mv $$f.out $$f; \
+		chmod +x $$f; \
 	done
 
 install-vim:
 	@for d in $(DESTDIR)/$(vimdir) /etc/vim; do \
 		if ! test -d $$d; then continue; fi ; \
@@ -143,19 +153,25 @@
 		rm -f $$d/syntax/asciidoc.vim ; \
 		rm -f $$d/ftdetect/asciidoc_filetype.vim ; \
 	done
 
 
-build: fixconfpath
+build: fixconfpath $(manp)
 
-install: $(PROGTARGETS) $(DATATARGETS) renameprog install-vim
 
+install: all $(PROGTARGETS) $(DATATARGETS) progsymlink install-vim
+
 uninstall: uninstall-vim
 	rm -f $(DESTDIR)/$(progdir)/asciidoc
+	rm -f $(DESTDIR)/$(progdir)/asciidoc.py
 	rm -f $(DESTDIR)/$(progdir)/a2x
-	rm -f $(DESTDIR)/$(mandir)/asciidoc.1
-	rm -f $(DESTDIR)/$(mandir)/a2x.1
+	rm -f $(DESTDIR)/$(progdir)/a2x.py
+	rm -f $(DESTDIR)/$(manpdir)/asciidoc.1
+	rm -f $(DESTDIR)/$(manpdir)/a2x.1
 	rm -rf $(DESTDIR)/$(confdir)
 	rm -rf $(DESTDIR)/$(docdir)
+
+clean:
+	rm -f $(manp)
 
 test:
 	@echo "Nothing to see here...Move along."