From: Keith Packard <keithp@keithp.com>
Date: Tue, 30 Mar 2004 17:26:17 +0000 (+0000)
Subject: Fix --disable-doc mode code to locate built documents in ${srcdir} instead
X-Git-Tag: fc-2_2_3~4
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=0b21fd7cc352086884c08161f14a49ade25253cf;p=fontconfig.git

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

diff --git a/ChangeLog b/ChangeLog
index 9d50541..ee2b484 100644
--- 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 e3fe9e8..431ef49 100644
--- 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