diff options
author | Akira TAGOH <akira@tagoh.org> | 2012-03-10 22:05:07 +0900 |
---|---|---|
committer | Akira TAGOH <akira@tagoh.org> | 2012-03-10 22:05:07 +0900 |
commit | b75eb63982a54c0fb4576d8a655ef734908d3604 (patch) | |
tree | 30cb882f332f131441c629fb58385e5b51d44701 | |
parent | a47899a853e4ed3405f398f43d03424095ae73f5 (diff) | |
download | fontconfig-b75eb63982a54c0fb4576d8a655ef734908d3604.tar.gz |
Fix a build fail on some environment
-rw-r--r-- | fc-case/Makefile.am | 10 | ||||
-rw-r--r-- | fc-glyphname/Makefile.am | 4 | ||||
-rw-r--r-- | fc-lang/Makefile.am | 4 |
3 files changed, 8 insertions, 10 deletions
diff --git a/fc-case/Makefile.am b/fc-case/Makefile.am index de657af..9138c19 100644 --- a/fc-case/Makefile.am +++ b/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 diff --git a/fc-glyphname/Makefile.am b/fc-glyphname/Makefile.am index 697b5c3..13b3d7b 100644 --- a/fc-glyphname/Makefile.am +++ b/fc-glyphname/Makefile.am @@ -41,8 +41,8 @@ $(TARG): $(STMPL) fc-glyphname.c $(SGLYPHNAME) @echo Warning: cannot rebuild $(TARG) when cross-compiling else $(TARG): $(STMPL) fc-glyphname$(EXEEXT) $(SGLYPHNAME) - $(AM_V_GEN) $(RM) $(TARG); \ - ./fc-glyphname$(EXEEXT) $(SGLYPHNAME) < $(STMPL) > $(TARG).tmp && \ + -rm $(TARG) + $(AM_V_GEN) $(builddir)/fc-glyphname$(EXEEXT) $(SGLYPHNAME) < $(STMPL) > $(TARG).tmp && \ mv $(TARG).tmp $(TARG) endif diff --git a/fc-lang/Makefile.am b/fc-lang/Makefile.am index d2eca5b..09292bb 100644 --- a/fc-lang/Makefile.am +++ b/fc-lang/Makefile.am @@ -40,8 +40,8 @@ $(TARG):$(ORTH) fc-lang.c $(STMPL) @echo Warning: cannot rebuild $(TARG) when cross-compiling else $(TARG):$(ORTH) fc-lang${EXEEXT} $(STMPL) - $(AM_V_GEN) $(RM) $(TARG); \ - ./fc-lang${EXEEXT} -d ${srcdir} $(ORTH) < $(STMPL) > $(TARG).tmp && \ + -rm $(TARG) + $(AM_V_GEN) $(builddir)/fc-lang${EXEEXT} -d ${srcdir} $(ORTH) < $(STMPL) > $(TARG).tmp && \ mv $(TARG).tmp $(TARG) endif |