Merge remote-tracking branch 'origin/maint'

[bison.git] / doc / local.mk

diff --git a/doc/local.mk b/doc/local.mk
index 513e548adb6d09691a1924118e00443bfe9dd408..54c03ebf2996f490ed55271cad10aad92a2a6345 100644 (file)
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -14,14 +14,14 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AM_MAKEINFOFLAGS = --no-split
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AM_MAKEINFOFLAGS = --no-split

-info_TEXINFOS = doc/bison.texinfo
+info_TEXINFOS = doc/bison.texi

 doc_bison_TEXINFOS =                            \
   $(CROSS_OPTIONS_TEXI)                         \
   doc/fdl.texi                                  \
   doc/gpl-3.0.texi
 
 doc_bison_TEXINFOS =                            \
   $(CROSS_OPTIONS_TEXI)                         \
   doc/fdl.texi                                  \
   doc/gpl-3.0.texi
 

-CLEANFILES = doc/bison.fns
-CLEANDIRS = doc/*.t2d
+TEXI2DVI = texi2dvi --build-dir=doc/bison.t2d
+CLEANDIRS = doc/bison.t2d

 clean-local:
        rm -rf $(CLEANDIRS)
 
 clean-local:
        rm -rf $(CLEANDIRS)
 


@@ -36,7 +36,7 @@ $(CROSS_OPTIONS_TEXI): doc/bison.help $(CROSS_OPTIONS_PL)
        $(AM_V_GEN){ test ! -f $@ || cat $@; } >$@~
        $(AM_V_at)test ! -f $@.tmp || rm -f $@.tmp
        $(AM_V_at)src/bison$(EXEEXT) --help |                            \
        $(AM_V_GEN){ test ! -f $@ || cat $@; } >$@~
        $(AM_V_at)test ! -f $@.tmp || rm -f $@.tmp
        $(AM_V_at)src/bison$(EXEEXT) --help |                            \

-         perl $(CROSS_OPTIONS_PL) $(top_srcdir)/src/scan-gram.l >$@.tmp
+         $(PERL) $(CROSS_OPTIONS_PL) $(top_srcdir)/src/scan-gram.l >$@.tmp

        $(AM_V_at)diff -u $@~ $@.tmp || true
        $(AM_V_at)mv $@.tmp $@
 MAINTAINERCLEANFILES = $(CROSS_OPTIONS_TEXI)
        $(AM_V_at)diff -u $@~ $@.tmp || true
        $(AM_V_at)mv $@.tmp $@
 MAINTAINERCLEANFILES = $(CROSS_OPTIONS_TEXI)


@@ -46,12 +46,11 @@ MAINTAINERCLEANFILES = $(CROSS_OPTIONS_TEXI)
 ## ---------- ##
 
 EXTRA_DIST += doc/refcard.tex
 ## ---------- ##
 
 EXTRA_DIST += doc/refcard.tex

-CLEANFILES += doc/refcard.dvi doc/refcard.log doc/refcard.ps
+CLEANFILES += doc/refcard.pdf

 
 

-doc/refcard.dvi: doc/refcard.tex
-       $(AM_V_GEN)cd doc && tex refcard.tex
+doc/refcard.pdf: doc/refcard.tex
+       $(AM_V_GEN) cd doc && pdftex $(abs_top_srcdir)/doc/refcard.tex

 
 

-doc/refcard.ps: doc/refcard.dvi

 
 
 ## ---------------- ##
 
 
 ## ---------------- ##


@@ -80,9 +79,9 @@ doc/refcard.ps: doc/refcard.dvi
 EXTRA_DIST += $(top_srcdir)/doc/bison.help
 MAINTAINERCLEANFILES += $(top_srcdir)/doc/bison.help
 $(top_srcdir)/doc/bison.help: src/bison$(EXEEXT)
 EXTRA_DIST += $(top_srcdir)/doc/bison.help
 MAINTAINERCLEANFILES += $(top_srcdir)/doc/bison.help
 $(top_srcdir)/doc/bison.help: src/bison$(EXEEXT)

-       $(AM_V_GEN)$< --version >doc/bison.help.t
-       $(AM_V_at)$< --help   >>doc/bison.help.t
-       $(AM_V_at)$(top_srcdir)/build-aux/move-if-change doc/bison.help.t $@
+       $(AM_V_GEN)src/bison$(EXEEXT) --version >doc/bison.help.tmp
+       $(AM_V_at) src/bison$(EXEEXT) --help   >>doc/bison.help.tmp
+       $(AM_V_at)$(top_srcdir)/build-aux/move-if-change doc/bison.help.tmp $@

 
 
 ## ----------- ##
 
 
 ## ----------- ##


@@ -128,6 +127,7 @@ html-local: doc/Doxyfile
 
 edit = sed -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
           -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
 
 edit = sed -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
           -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \

+          -e 's,@PERL\@,$(PERL),g' \

           -e 's,@top_builddir\@,$(top_builddir),g' \
           -e 's,@top_srcdir\@,$(top_srcdir),g'
 
           -e 's,@top_builddir\@,$(top_builddir),g' \
           -e 's,@top_srcdir\@,$(top_srcdir),g'