summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Lam <plam@MIT.EDU>2006-02-24 19:32:58 +0000
committerPatrick Lam <plam@MIT.EDU>2006-02-24 19:32:58 +0000
commitb152a85bdc5c911883af4b0e7930cbe12531d179 (patch)
tree8bf667b0f30bdd9c2469e6e858eaf6e40d871350
parent63d2df3f92b633ba82bfb4fb388062a21e0a0178 (diff)
Fix placement of @s.fc-2_3_94
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.am14
2 files changed, 12 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 66e1008..b94b0f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,11 @@
Bump version to 2.3.94.
2006-02-24 Patrick Lam <plam@mit.edu>
+ * Makefile.am:
+
+ Fix placement of @s.
+
+2006-02-24 Patrick Lam <plam@mit.edu>
* conf.d/10-fonts-persian.conf:
Remove unconditional emboldening (per Behdad's instructions).
diff --git a/Makefile.am b/Makefile.am
index 9abba95..7001e0c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -91,16 +91,16 @@ install-data-local:
echo " $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf"; \
$(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \
fi; fi
- if $(RUN_FC_CACHE_TEST); then \
+ @(if $(RUN_FC_CACHE_TEST); then \
echo " fc-cache/fc-cache -f -v"; \
fc-cache/fc-cache -f -v; \
else \
- @echo "***"; \
- @echo "*** Warning: fonts.cache not built"; \
- @echo "***"; \
- @echo "*** Generate this file manually on host system using fc-cache"; \
- @echo "***"; \
- fi
+ echo "***"; \
+ echo "*** Warning: fonts.cache not built"; \
+ echo "***"; \
+ echo "*** Generate this file manually on host system using fc-cache"; \
+ echo "***"; \
+ fi)
uninstall-local:
if [ -f $(srcdir)/fonts.conf ]; then \