[xiph-commits] r11097 - trunk/ao

[j at svn.xiph.org]

Author: j
Date: 2006-04-05 06:21:01 -0700 (Wed, 05 Apr 2006)
New Revision: 11097

Modified:
   trunk/ao/Makefile.am
   trunk/ao/configure.in
Log:
fix #885: ao Makefile does not honor "mandir"

Modified: trunk/ao/Makefile.am
===================================================================
--- trunk/ao/Makefile.am	2006-04-04 22:00:40 UTC (rev 11096)
+++ trunk/ao/Makefile.am	2006-04-05 13:21:01 UTC (rev 11097)
@@ -10,7 +10,6 @@
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = ao.pc
 
-mandir = @MANDIR@
 man_MANS = libao.conf.5
 
 EXTRA_DIST = README AUTHORS CHANGES COPYING libao.spec ao.m4 acinclude.m4 ao.pc.in $(man_MANS)

Modified: trunk/ao/configure.in
===================================================================
--- trunk/ao/configure.in	2006-04-04 22:00:40 UTC (rev 11096)
+++ trunk/ao/configure.in	2006-04-05 13:21:01 UTC (rev 11097)
@@ -121,17 +121,6 @@
 AC_DEFINE_UNQUOTED(DLOPEN_FLAG, $DLOPEN_FLAG)
 AC_DEFINE_UNQUOTED(SHARED_LIB_EXT, "$SHARED_LIB_EXT")
 
-dnl --------------------------------------------------
-dnl Work around FHS stupidity
-dnl --------------------------------------------------
-
-if test "$prefix" = "/usr"; then
-    MANDIR='$(datadir)/man'
-else
-    MANDIR='$(prefix)/man'
-fi
-AC_SUBST(MANDIR)
-
 dnl ==============================
 dnl Checks for types
 dnl ==============================