On 27/02/2015 06:57, Akira TAGOH wrote:
commit d6a5cc665a1d7e91332944353e92c83ad114368c
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Fri Feb 27 14:17:26 2015 +0900
Hardcode the blanks in the library
https://bugs.freedesktop.org/show_bug.cgi?id=79956
[...]
diff --git a/fc-blanks/Makefile.am b/fc-blanks/Makefile.am
[...]
+
+NULL =
+BLANKSPY = fc-blanks.py
+BLANKS_H = fcblanks.h
+TMPL = fcblanks.tmpl.h
+noinst_SCRIPTS = $(BLANKSPY)
+noinst_HEADERS = $(BLANKS_H)
+
+$(BLANKS_H): $(BLANKSPY) $(TMPL)
+ $(AM_V_GEN) $(PYTHON) $(BLANKSPY) < $(TMPL) > $(BLANKS_H).tmp && \
+ mv $(BLANKS_H).tmp $(BLANKS_H) || ($(RM) $(BLANKS_H).tmp && false)
This doesn't work when srcdir != builddir. See [1]
Patch attached.
[1] http://tinderbox.x.org/builds/2015-02-27-0014/logs/fontconfig/#build
From 99afe6cee2e991d84e0e660ec7fca9ebb0b2eca8 Mon Sep 17 00:00:00 2001
From: Jon TURNEY <jon.turney@xxxxxxxxxxxxxxxx>
Date: Fri, 27 Feb 2015 20:17:44 +0000
Subject: [PATCH] Fix fc-blanks build for srcdir != builddir
Signed-off-by: Jon TURNEY <jon.turney@xxxxxxxxxxxxxxxx>
---
fc-blanks/Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fc-blanks/Makefile.am b/fc-blanks/Makefile.am
index f9c2486..1941a98 100644
--- a/fc-blanks/Makefile.am
+++ b/fc-blanks/Makefile.am
@@ -21,9 +21,9 @@
# PERFORMANCE OF THIS SOFTWARE.
NULL =
-BLANKSPY = fc-blanks.py
+BLANKSPY = $(srcdir)/fc-blanks.py
BLANKS_H = fcblanks.h
-TMPL = fcblanks.tmpl.h
+TMPL = $(srcdir)/fcblanks.tmpl.h
noinst_SCRIPTS = $(BLANKSPY)
noinst_HEADERS = $(BLANKS_H)
--
2.1.4
_______________________________________________
Fontconfig mailing list
Fontconfig@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/fontconfig
