projects
/
platform
/
upstream
/
fontconfig.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2e375b6
)
Bug 18886 installation crashes if fontconfig already installed
author
Behdad Esfahbod
<behdad@behdad.org>
Thu, 25 Feb 2010 20:10:41 +0000
(15:10 -0500)
committer
Behdad Esfahbod
<behdad@behdad.org>
Thu, 25 Feb 2010 20:10:41 +0000
(15:10 -0500)
Run the uninstalled fc-cache, not the installed one.
Makefile.am
patch
|
blob
|
history
diff --git
a/Makefile.am
b/Makefile.am
index
e08857e
..
1cde132
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-105,8
+105,8
@@
install-data-local: fonts.conf
$(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \
fi; fi
@(if $(RUN_FC_CACHE_TEST); then \
- echo "
$(bindir)/fc-cache
-s -f -v"; \
-
$(bindir)/fc-cache
-s -f -v; \
+ echo "
fc-cache$(EXEEXT)
-s -f -v"; \
+
fc-cache/fc-cache$(EXEEXT)
-s -f -v; \
else \
echo "***"; \
echo "*** Warning: fonts.cache not built"; \