walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

of ${builddir}
This commit is contained in:
Keith Packard 2004-03-30 17:26:17 +00:00
parent 6f68171097
commit 0b21fd7cc3
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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> 2004-03-30 Keith Packard <keithp@keithp.com>
* src/fcfreetype.c: (FcGetPixelSize), (FcFreeTypeQuery): * src/fcfreetype.c: (FcGetPixelSize), (FcFreeTypeQuery):

14
doc/Makefile.am
View File

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