summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRon <ron@debian.org>2012-09-19 16:12:16 +0930
committerRalph Giles <giles@mozilla.com>2012-09-19 10:09:32 -0700
commitff16ab098e1ffe799f8ea87efc7458fcf0a93371 (patch)
treecffd70695a23060d57cd7349a56a2ef5e236e37a
parentcc71cded7690c1fb0912c8e54919cf3462f521d6 (diff)
downloadopus-ff16ab098e1ffe799f8ea87efc7458fcf0a93371.tar.gz
Just fix opus-uninstalled.pc instead of tweaking the build dir
Doing it this way means it's only the weird corner case that actually pays for being weird, and we don't litter the build dir with an extra link that normal builds really don't need at all. It also avoids the problem of platforms where LN_S isn't well defined.
-rw-r--r--configure.ac7
-rw-r--r--opus-uninstalled.pc.in2
2 files changed, 1 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac
index 5b0c296b..54d0405a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -292,13 +292,6 @@ AC_SUBST([PC_BUILD])
AC_SUBST([PC_LIBM])
-AC_CONFIG_COMMANDS([builddir-include],
- [ if test ! -e include; then
- $LN_S $ac_top_srcdir/include include
- fi
- ],[ LN_S="$LN_S" ]
- )
-
AC_CONFIG_FILES([Makefile opus.pc opus-uninstalled.pc
doc/Makefile doc/Doxyfile])
diff --git a/opus-uninstalled.pc.in b/opus-uninstalled.pc.in
index b26b208c..36e8db6a 100644
--- a/opus-uninstalled.pc.in
+++ b/opus-uninstalled.pc.in
@@ -9,4 +9,4 @@ Version: @VERSION@
Requires:
Conflicts:
Libs: ${libdir}/libopus.a @PC_LIBM@
-Cflags: -I${includedir}/include
+Cflags: -I${pcfiledir}/@top_srcdir@/include