[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 Makefile.am  |    1 -
 configure.ac |    1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e11f15628cff04c4a742f88abee22f440edcce52
Author: Christoph J. Thompson <cjsthompson at gmail.com>
Date:   Fri Feb 1 02:27:32 2013 +0100

    Use the PKG_INSTALLDIR macro.
    
    	modified:   Makefile.am
    	modified:   configure.ac

diff --git a/Makefile.am b/Makefile.am
index 84c91ac..8510f55 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,7 +59,6 @@ MAINTAINERCLEANFILES = \
 	$(srcdir)/mkinstalldirs \
 	`find "$(srcdir)" -type f -name Makefile.in -print`
 
-pkgconfigdir=$(libdir)/pkgconfig
 pkgconfig_DATA = fontconfig.pc
 
 baseconfigdir = $(BASECONFIGDIR)
diff --git a/configure.ac b/configure.ac
index f8a41c9..d7e4ed1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,6 +68,7 @@ AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
 AC_PROG_MAKE_SET
 PKG_PROG_PKG_CONFIG
+PKG_INSTALLDIR
 
 AC_MSG_CHECKING([for RM macro])
 _predefined_rm=`make -p -f /dev/null 2>/dev/null|grep '^RM ='|sed -e 's/^RM = //'`