aboutsummaryrefslogtreecommitdiff
path: root/fontconfig/fc-query
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-03-12 08:32:17 +0100
committermarha <marha@users.sourceforge.net>2012-03-12 08:32:17 +0100
commit285bce5f59c5466a6fd1e3af601daa7cce066ea4 (patch)
treee1a9205dd5acd2c0ef7dc8a20ec3fac3a3aecf7f /fontconfig/fc-query
parentf7eb7329c8efe023b304d5e66b08d1a998973220 (diff)
parentb91444584a64f4f7b3eaeee05ef36ac53691fb24 (diff)
downloadvcxsrv-285bce5f59c5466a6fd1e3af601daa7cce066ea4.tar.gz
vcxsrv-285bce5f59c5466a6fd1e3af601daa7cce066ea4.tar.bz2
vcxsrv-285bce5f59c5466a6fd1e3af601daa7cce066ea4.zip
Merge remote-tracking branch 'origin/released'
Conflicts: libX11/src/OpenDis.c libX11/src/xcb_io.c xorg-server/xkeyboard-config/keymap/sun_vndr/all.in xorg-server/xkeyboard-config/semantics/default.in
Diffstat (limited to 'fontconfig/fc-query')
-rw-r--r--fontconfig/fc-query/Makefile.am8
1 files changed, 4 insertions, 4 deletions
diff --git a/fontconfig/fc-query/Makefile.am b/fontconfig/fc-query/Makefile.am
index 132dd401c..31fced90c 100644
--- a/fontconfig/fc-query/Makefile.am
+++ b/fontconfig/fc-query/Makefile.am
@@ -44,14 +44,14 @@ fc_query_LDADD = ${top_builddir}/src/libfontconfig.la
if USEDOCBOOK
${man_MANS}: ${SGML}
- $(RM) $@
- $(DOC2MAN) ${SGML}
- $(RM) manpage.*
+ -@rm $@
+ $(AM_V_GEN) $(DOC2MAN) ${SGML}
+ @rm manpage.*
all-local: $(man_MANS)
clean-local:
- $(RM) $(man_MANS)
+ -rm $(man_MANS)
else
all-local: