X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Makefile.am;h=cc3024e68a54d2468b0e2454a7d405ed88dea332;hb=7c7af316ffc8242ac41f261845302748e98b85b4;hp=cc5435ea0113a39ff943b57776e81538f2fc67f4;hpb=96220a5ed9d1d761b14a7ac516ac6786c132f280;p=platform%2Fupstream%2Ffontconfig.git

diff --git a/Makefile.am b/Makefile.am
index cc5435e..cc3024e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,21 +21,22 @@
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.
 
-SUBDIRS=fontconfig fc-case fc-lang fc-glyphname src \
-	fc-cache fc-cat fc-list fc-match fc-pattern fc-query fc-scan \
-	fc-validate conf.d test
+SUBDIRS=fontconfig fc-case fc-lang src \
+	fc-cache fc-cat fc-conflist fc-list fc-match \
+	fc-pattern fc-query fc-scan fc-validate conf.d \
+	its po po-conf test
 if ENABLE_DOCS
 SUBDIRS += doc
 endif
 
 ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST = \
-        fontconfig.pc.in \
-        fonts.conf.in \
+EXTRA_DIST = config.rpath  \
+	fontconfig.pc.in \
+	fonts.conf.in \
 	fonts.dtd \
-        fontconfig.spec.in \
-        fontconfig.spec \
+	fontconfig.spec.in \
+	fontconfig.spec \
 	fontconfig-zip.in \
 	config-fixups.h
 CLEANFILES = fonts.conf
@@ -53,6 +54,7 @@ MAINTAINERCLEANFILES = \
 	$(srcdir)/ltmain.sh \
 	$(srcdir)/missing \
 	$(srcdir)/mkinstalldirs \
+	$(srcdir)/test-driver \
 	`find "$(srcdir)" -type f -name Makefile.in -print`
 
 pkgconfig_DATA = fontconfig.pc
@@ -89,12 +91,14 @@ $(srcdir)/ChangeLog:
 
 .PHONY: ChangeLog
 
+FC_CONFIGDIR = $(subst $(BASECONFIGDIR)/,,$(CONFIGDIR))
+
 fonts.conf: fonts.conf.in Makefile
 	sed \
 		-e 's,@FC_CACHEDIR\@,$(FC_CACHEDIR),g' \
 		-e 's,@FC_DEFAULT_FONTS\@,$(FC_DEFAULT_FONTS),g' \
 		-e 's,@FC_FONTPATH\@,$(FC_FONTPATH),g' \
-		-e 's,@CONFIGDIR\@,$(CONFIGDIR),g' \
+		-e 's,@CONFIGDIR\@,$(FC_CONFIGDIR),g' \
 		-e 's,@PACKAGE\@,$(PACKAGE),g' \
 		-e 's,@VERSION\@,$(VERSION),g' \
 		$(srcdir)/$@.in > $@.tmp && \