Browse Source

doc: stop generating defines.texi from configure

* generating defines.texi from configure means quagga.info will always have
  to be rebuilt by end-users, even from dist tarballs. Also breaks
  distcheck assumptions that info won't need to be built - which can be
  fixed with 'info-in-builddir' automake option, but that's too recent
  to rely on.
* doc/defines.texi.in: nuke
* doc/defines.texi: Add static version.
* {doc/Makefile.am,configure}: nuke autogen of above
* doc/quagga.texi: remove the 1 use of PACKAGE_STRING
Paul Jakma 2 years ago
parent
commit
db968b6d32
5 changed files with 4 additions and 10 deletions
  1. 0 1
      configure.ac
  2. 0 1
      doc/.gitignore
  3. 0 3
      doc/Makefile.am
  4. 3 4
      doc/defines.texi.in
  5. 1 1
      doc/quagga.texi

+ 0 - 1
configure.ac

@@ -1635,7 +1635,6 @@ AC_CONFIG_FILES([Makefile lib/Makefile qpb/Makefile zebra/Makefile ripd/Makefile
 	  fpm/Makefile
 	  redhat/quagga.spec 
 	  lib/version.h
-	  doc/defines.texi
 	  isisd/topology/Makefile
 	  pkgsrc/bgpd.sh pkgsrc/ospf6d.sh pkgsrc/ospfd.sh
 	  pkgsrc/ripd.sh pkgsrc/ripngd.sh pkgsrc/zebra.sh])

+ 0 - 1
doc/.gitignore

@@ -4,7 +4,6 @@ mdate-sh
 draft-zebra-00.txt
 quagga.info-*
 zebra.html
-defines.texi
 version.texi
 quagga.html
 quagga.info

+ 0 - 3
doc/Makefile.am

@@ -34,9 +34,6 @@ figures_txt = $(figures_names_parts:%=fig%.txt)
 # provided by automake. If you are an automake wizard, please feel free to
 # compact it somehow.
 
-# Built from defines.texi.in
-BUILT_SOURCES = defines.texi
-
 info_TEXINFOS = quagga.texi
 
 # Have to manually specify the quagga.pdf rule in order to allow

+ 3 - 4
doc/defines.texi.in

@@ -1,10 +1,9 @@
 @c -*- texinfo -*-
-@c @configure_input@
 
 @c Set variables
-@set PACKAGE_NAME @PACKAGE_NAME@
-@set PACKAGE_TARNAME @PACKAGE_TARNAME@
-@set PACKAGE_STRING @PACKAGE_STRING@
+@set PACKAGE_NAME Quagga
+@set PACKAGE_TARNAME quagga
+@set PACKAGE_STRING Quagga 1.2.0
 @set AUTHORS Kunihiro Ishiguro, et al.
 @set COPYRIGHT_YEAR 1999-2005
 @set COPYRIGHT_STR Copyright @copyright{} @value{COPYRIGHT_YEAR} @value{AUTHORS}

+ 1 - 1
doc/quagga.texi

@@ -70,7 +70,7 @@ Version @value{VERSION}.
 		     
 @uref{http://www.quagga.net,,Quagga} is an advanced routing software package
 that provides a suite of TCP/IP based routing protocols.  This is the Manual
-for @value{PACKAGE_STRING}. @uref{http://www.quagga.net,,Quagga} is a fork of 
+for Quagga @value{VERSION}. @uref{http://www.quagga.net,,Quagga} is a fork of 
 @uref{http://www.zebra.org,,GNU Zebra}.
 
 @insertcopying