Fix --disable-doc mode code to locate built documents in ${srcdir} instead

    of ${builddir}

diff --git a/ChangeLog b/ChangeLog
index 9d50541cdaae4f3e37afe5606848fdec60d63453..ee2b48474cb2bebe7c3b16b1123e5b80c01ab3bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-30  Keith Packard  <keithp@keithp.com>
+
+       * doc/Makefile.am:
+       Fix --disable-doc mode code to locate built documents in ${srcdir}
+       instead of ${builddir}
+
 2004-03-30  Keith Packard  <keithp@keithp.com>
 
        * src/fcfreetype.c: (FcGetPixelSize), (FcFreeTypeQuery):

diff --git a/doc/Makefile.am b/doc/Makefile.am
index e3fe9e8bf0460f25b4f0d15e02db8f8287fa23d1..431ef49a3d4d4def87ef8307304f84320243b249 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -154,7 +154,12 @@ fontconfig-user.txt:  local-fontconfig-user.sgml version.sgml
 
 CLEANFILES=confdir.sgml local-fontconfig-user.sgml local-fontconfig-devel.sgml
 
+BUILT_DOC_DIR=.
+
 else
+
+BUILT_DOC_DIR=${srcdir}
+
 all-local:
 clean-local:
 endif
@@ -163,12 +168,13 @@ install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(DOCDIR)
        for i in $(DOC_FILES); do \
          echo '-- Installing '$$i ; \
-         $(INSTALL_DATA) $$i $(DESTDIR)$(DOCDIR)/$$i; \
+         $(INSTALL_DATA) $(BUILT_DOC_DIR)/$$i $(DESTDIR)$(DOCDIR)/$$i; \
        done
        for i in $(DOC_DIRS); do \
          $(mkinstalldirs) $(DESTDIR)$(DOCDIR)/$$i ; \
-         for f in $$i/*; do \
-           echo '-- Installing '$$f ; \
-           $(INSTALL_DATA) $$f $(DESTDIR)$(DOCDIR)/$$f; \
+         for f in $(BUILT_DOC_DIR)/$$i/*; do \
+           g=`echo $$f | sed 's;$(BUILT_DOC_DIR)/;;'`; \
+           echo '-- Installing '$$g ; \
+           $(INSTALL_DATA) $$f $(DESTDIR)$(DOCDIR)/$$g; \
          done \
        done