[xiph-commits] r16634 - in trunk/theora: . doc doc/spec

[j at svn.xiph.org]

Author: j
Date: 2009-10-11 09:24:55 -0700 (Sun, 11 Oct 2009)
New Revision: 16634

Modified:
   trunk/theora/configure.ac
   trunk/theora/doc/Makefile.am
   trunk/theora/doc/spec/Makefile.am
Log:
second patch from ticket #1597
* don't set docdir in doc/{,spec/}Makefile.am so
  that docdir can actually be set with --docdir=foo
(closes:#1597)



Modified: trunk/theora/configure.ac
===================================================================
--- trunk/theora/configure.ac	2009-10-11 16:22:30 UTC (rev 16633)
+++ trunk/theora/configure.ac	2009-10-11 16:24:55 UTC (rev 16634)
@@ -484,7 +484,7 @@
 AS_AC_EXPAND(LIBDIR, ${libdir})
 AS_AC_EXPAND(INCLUDEDIR, ${includedir})
 AS_AC_EXPAND(BINDIR, ${bindir})
-AS_AC_EXPAND(DOCDIR, ${datadir}/doc)
+AS_AC_EXPAND(DOCDIR, ${docdir})
 
 if test $HAVE_DOXYGEN = "false"; then
   doc_build="no"
@@ -515,7 +515,7 @@
 
     libtheora: ................... ${LIBDIR}
     C header files: .............. ${INCLUDEDIR}/theora
-    Documentation: ............... ${DOCDIR}/$PACKAGE
+    Documentation: ............... ${DOCDIR}
 
   Building:
 

Modified: trunk/theora/doc/Makefile.am
===================================================================
--- trunk/theora/doc/Makefile.am	2009-10-11 16:22:30 UTC (rev 16633)
+++ trunk/theora/doc/Makefile.am	2009-10-11 16:24:55 UTC (rev 16634)
@@ -2,8 +2,6 @@
 
 SUBDIRS = spec
 
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
-
 static_docs = vp3-format.txt color.html \
 	draft-ietf-avt-rtp-theora-00.xml \
 	draft-ietf-avt-rtp-theora-00.txt

Modified: trunk/theora/doc/spec/Makefile.am
===================================================================
--- trunk/theora/doc/spec/Makefile.am	2009-10-11 16:22:30 UTC (rev 16633)
+++ trunk/theora/doc/spec/Makefile.am	2009-10-11 16:24:55 UTC (rev 16634)
@@ -3,8 +3,6 @@
 # makefile to generate the spec document from sources
 # requires transfig and pdflatex
 
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
-
 built_docs = Theora.pdf
 
 if BUILD_SPEC