[xiph-commits] r13014 - in trunk/speex: doc src

[conrad at svn.xiph.org]

Author: conrad
Date: 2007-06-05 18:57:59 -0700 (Tue, 05 Jun 2007)
New Revision: 13014

Modified:
   trunk/speex/doc/Makefile.am
   trunk/speex/src/Makefile.am
Log:
Remove hardcoded docdir, mandir from {doc,src}/Makefile.am, to allow
overriding of these variables. Bug reported by Alex (alkos333):
http://lists.xiph.org/pipermail/speex-dev/2007-June/005732.html
NB. As of this revision, docs are no longer installed into
$(prefix)/share/doc/speex$(VERSION) but into the GNU Coding Standards
default ${datarootdir}/doc/${PACKAGE} (effectively the same thing without
the VERSION appended)


Modified: trunk/speex/doc/Makefile.am
===================================================================
--- trunk/speex/doc/Makefile.am	2007-06-05 16:23:59 UTC (rev 13013)
+++ trunk/speex/doc/Makefile.am	2007-06-06 01:57:59 UTC (rev 13014)
@@ -1,5 +1,3 @@
-docdir=$(prefix)/share/doc/@PACKAGE at -@VERSION@
-
 doc_DATA = manual.pdf
 
 EXTRA_DIST = $(doc_DATA)

Modified: trunk/speex/src/Makefile.am
===================================================================
--- trunk/speex/src/Makefile.am	2007-06-05 16:23:59 UTC (rev 13013)
+++ trunk/speex/src/Makefile.am	2007-06-06 01:57:59 UTC (rev 13014)
@@ -7,7 +7,6 @@
 
 INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) @OGG_CFLAGS@
 
-mandir = $(prefix)/share/man
 man_MANS = speexenc.1 speexdec.1
 
 EXTRA_DIST = $(man_MANS) getopt_win.h getopt.c getopt1.c wave_out.c wave_out.h skeleton.h