X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=Makefile.am;h=e316d8a8556fb72b637859c161a7ecf3f6bc16b7;hb=e3b771a63e837b341bbd1e3e7e9c868244506f62;hp=ed624c6f09f2d55cccd4117b613471f62701b648;hpb=683dc3c476f1ee514c252a05311efc7a97fbaee9;p=fontconfig.git

diff --git a/Makefile.am b/Makefile.am
index ed624c6..e316d8a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,40 +22,8 @@
 #  PERFORMANCE OF THIS SOFTWARE.
 
 DOCSRC=@DOCSRC@
-SUBDIRS=fontconfig fc-case fc-lang fc-glyphname src \
-	fc-cache fc-list fc-match conf.d $(DOCSRC) test
-
-DEBIAN = \
-	debian/changelog \
-	debian/compat \
-	debian/control \
-	debian/copyright \
-	debian/fontconfig.config \
-	debian/fontconfig.defoma \
-	debian/fontconfig.dirs \
-	debian/fontconfig.install \
-	debian/fontconfig.postinst \
-	debian/fontconfig.postrm \
-	debian/fontconfig.templates \
-	debian/fontconfig-udeb.install \
-	debian/libfontconfig1-dev.install \
-	debian/libfontconfig1.install \
-	debian/local.conf.md5sum \
-	debian/README.Debian \
-	debian/rules \
-	debian/po/POTFILES.in \
-	debian/po/templates.pot \
-	debian/po/cs.po \
-	debian/po/da.po \
-	debian/po/de.po \
-	debian/po/es.po \
-	debian/po/fr.po \
-	debian/po/ja.po \
-	debian/po/nl.po \
-	debian/po/pt_BR.po \
-	debian/po/pt.po \
-	debian/po/tr.po \
-	debian/po/zh_CN.po
+SUBDIRS=fontconfig fc-case fc-lang fc-glyphname fc-arch src \
+	fc-cache fc-cat fc-list fc-match conf.d $(DOCSRC) test
 	 
 EXTRA_DIST = \
         fontconfig.pc.in \
@@ -63,8 +31,7 @@ EXTRA_DIST = \
 	fonts.dtd \
         fontconfig.spec.in \
         fontconfig.spec \
-	fontconfig-zip.in \
-	$(DEBIAN)
+	fontconfig-zip.in
 
 pkgconfigdir=$(libdir)/pkgconfig
 pkgconfig_DATA = fontconfig.pc
@@ -91,16 +58,16 @@ install-data-local:
 	  echo " $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf"; \
 	  $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \
 	fi; fi
-	if $(RUN_FC_CACHE_TEST); then \
-	    echo " fc-cache/fc-cache -f -v"; \
-	    fc-cache/fc-cache -f -v; \
+	@(if $(RUN_FC_CACHE_TEST); then \
+	    echo " fc-cache/fc-cache -s -f -v"; \
+	    fc-cache/fc-cache -s -f -v; \
 	else \
 	    echo "***"; \
 	    echo "*** Warning: fonts.cache not built"; \
 	    echo "***"; \
 	    echo "*** Generate this file manually on host system using fc-cache"; \
 	    echo "***"; \
-	fi
+	fi)
 
 uninstall-local:
 	if [ -f $(srcdir)/fonts.conf ]; then \