diff options
| author | Erik de Castro Lopo <erikd@mega-nerd.com> | 2013-02-05 19:44:05 +1100 |
|---|---|---|
| committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2013-02-05 19:44:05 +1100 |
| commit | 66c5d9490ccfa8a6da71259c4d169ec15c4e2f16 (patch) | |
| tree | 5aabab180b4dde99105b3dfea979ca357e5d61fe | |
| parent | 862b00cc40940568a915270f92e08ebb3b24c359 (diff) | |
configure.ac : Use PKG_INSTALLDIR when it exists.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 3 |
3 files changed, 6 insertions, 2 deletions
@@ -4,6 +4,10 @@ The 'pakt' chunk header should now be written correctly. Closes: https://github.com/erikd/libsndfile/issues/24 + * configure.ac Makefile.am + Use PKG_INSTALLDIR when it exists. Suggestion from Christoph Thompson. + Closes: https://github.com/erikd/libsndfile/pull/28 + 2013-02-03 Erik de Castro Lopo <erikd AT mega-nerd DOT com> * src/common.h src/caf.c diff --git a/Makefile.am b/Makefile.am index a16bcd1..e14d1fb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,7 +15,6 @@ EXTRA_DIST = libsndfile.spec.in sndfile.pc.in CLEANFILES = *~ -pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = sndfile.pc m4datadir = $(datadir)/aclocal diff --git a/configure.ac b/configure.ac index 388d369..8212645 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# Copyright (C) 1999-2012 Erik de Castro Lopo <erikd@mega-nerd.com>. +# Copyright (C) 1999-2013 Erik de Castro Lopo <erikd@mega-nerd.com>. dnl Require autoconf version AC_PREREQ(2.57) @@ -301,6 +301,7 @@ EXTERNAL_LIBS="" # Check for pkg-config outside the if statement. PKG_PROG_PKG_CONFIG +m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR], AC_SUBST([pkgconfigdir], ${libdir}/pkgconfig)) if test -n "$PKG_CONFIG" ; then if test x$enable_external_libs = xno ; then |