aboutsummaryrefslogtreecommitdiff
path: root/fontconfig/fc-case/Makefile.am
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-case/Makefile.am
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-case/Makefile.am')
-rw-r--r--fontconfig/fc-case/Makefile.am10
1 files changed, 4 insertions, 6 deletions
diff --git a/fontconfig/fc-case/Makefile.am b/fontconfig/fc-case/Makefile.am
index de657afa8..1855d47b8 100644
--- a/fontconfig/fc-case/Makefile.am
+++ b/fontconfig/fc-case/Makefile.am
@@ -33,10 +33,8 @@ noinst_PROGRAMS=fc-case
noinst_HEADERS=$(TARG)
-fc_case_SRCS= \
- fc-case.c \
- fccaseint.h \
- fccaseread.c
+fc_case_SOURCES= \
+ fc-case.c
CASEFOLDING=CaseFolding.txt
SCASEFOLDING=${top_srcdir}/fc-case/CaseFolding.txt
@@ -48,8 +46,8 @@ $(TARG): $(STMPL) fc-case.c $(SCASEFOLDING)
@echo Warning: cannot rebuild $(TARG) when cross-compiling
else
$(TARG): $(STMPL) fc-case$(EXEEXT) $(SCASEFOLDING)
- $(AM_V_GEN) $(RM) $(TARG); \
- ./fc-case$(EXEEXT) $(SCASEFOLDING) < $(STMPL) > $(TARG).tmp && \
+ -@rm $(TARG)
+ $(AM_V_GEN) $(builddir)/fc-case$(EXEEXT) $(SCASEFOLDING) < $(STMPL) > $(TARG).tmp && \
mv $(TARG).tmp $(TARG)
endif