Yet more cleanups to finish getting 'make distcheck' working This has been

[fontconfig.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7ee600e67ae7d08509ffcef16de5b48492d6a6b4..074a9aed7e40e3b2d6db037309834fd607d1c4dc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,8 @@
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.
 
-SUBDIRS=fontconfig fc-lang src fc-cache fc-list doc test
+DOCSRC=@DOCSRC@
+SUBDIRS=fontconfig fc-lang fc-glyphname src fc-cache fc-list fc-match $(DOCSRC) test
 
 EXTRA_DIST = \
         fontconfig.pc.in \
@@ -29,7 +30,8 @@ EXTRA_DIST = \
        fonts.dtd \
        local.conf \
         fontconfig.spec.in \
-        fontconfig.spec
+        fontconfig.spec \
+       fontconfig-zip.in
 
 pkgconfigdir=$(libdir)/pkgconfig
 pkgconfig_DATA = fontconfig.pc
@@ -38,6 +40,7 @@ configdir=$(CONFDIR)
 config_DATA=fonts.conf fonts.dtd
 
 install-data-local:
+       $(mkinstalldirs) $(DESTDIR)/$(configdir)
        if [ -f $(DESTDIR)$(configdir)/local.conf ]; then \
          echo "not overwriting existing $(DESTDIR)$(configdir)/local.conf"; \
        else if [ -f $(srcdir)/local.conf ]; then \
@@ -47,4 +50,4 @@ install-data-local:
          echo " $(INSTALL_DATA) local.conf $(DESTDIR)$(configdir)/local.conf"; \
          $(INSTALL_DATA) local.conf $(DESTDIR)$(configdir)/local.conf; \
        fi; fi; fi
-       if [ x$(DESTDIR) = x ]; then $(bindir)/fc-cache -f -v; fi
+       if [ x$(DESTDIR) = x ]; then fc-cache/fc-cache -f -v; fi