Unify directory canonicalization into FcStrAddFilename.

[fontconfig.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 44a506d5326fd1f9aa3ae14689f9d08989e1a547..e316d8a8556fb72b637859c161a7ecf3f6bc16b7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,9 +22,9 @@
 #  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
-
+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 \
         fonts.conf.in \
@@ -58,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 \
@@ -81,3 +81,15 @@ uninstall-local:
             rm -f $(DESTDIR)$(configdir)/fonts.conf; \
          fi; \
        fi; fi
+
+debuild debuild-signed: debuild-dirs
+       (cd $(distdir)/debian && debuild)
+
+debuild-unsigned: debuild-dirs
+       (cd $(distdir)/debian && debuild -us -uc)
+
+debuild-dirs: distdir
+       rm -f $(PACKAGE)_$(VERSION).orig.tar.gz
+       rm -rf $(distdir).orig
+       cp -a $(distdir) $(distdir).orig
+       rm -rf $(distdir).orig/debian