From 2a4e279235f618afa5013eb0817bb2af49b2c08f Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Tue, 4 Jun 2013 08:04:16 +0900 Subject: build: fix VPATH build in data directory --- data/layouts/fullscale/Makefile.am | 6 ++++-- data/layouts/touch/Makefile.am | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'data') diff --git a/data/layouts/fullscale/Makefile.am b/data/layouts/fullscale/Makefile.am index 1332b79..4f04245 100644 --- a/data/layouts/fullscale/Makefile.am +++ b/data/layouts/fullscale/Makefile.am @@ -14,8 +14,10 @@ SUFFIXES = .xml.in .xml .xml.in.xml: $(AM_V_GEN) \ rm -f $@ $@.xsl; \ - xsltproc --xinclude $(top_srcdir)/tools/basic.xsl $@.in > $@.xsl && \ - xsltproc --xinclude $@.xsl $@.in > $@ + srcdir=''; \ + test -f ./$@.in || srcdir=$(srcdir)/; \ + xsltproc --xinclude $(top_srcdir)/tools/basic.xsl $${srcdir}$@.in > $@.xsl && \ + xsltproc --xinclude $@.xsl $${srcdir}$@.in > $@ EXTRA_DIST = $(fullscalelayouts_in_files) $(common_files) diff --git a/data/layouts/touch/Makefile.am b/data/layouts/touch/Makefile.am index 3217a76..9446e57 100644 --- a/data/layouts/touch/Makefile.am +++ b/data/layouts/touch/Makefile.am @@ -18,8 +18,10 @@ SUFFIXES = .xml.in .xml .xml.in.xml: $(AM_V_GEN) \ rm -f $@ $@.xsl; \ - xsltproc --xinclude $(top_srcdir)/tools/basic.xsl $@.in > $@.xsl && \ - xsltproc --xinclude $@.xsl $@.in > $@ + srcdir=''; \ + test -f ./$@.in || srcdir=$(srcdir)/; \ + xsltproc --xinclude $(top_srcdir)/tools/basic.xsl $${srcdir}$@.in > $@.xsl && \ + xsltproc --xinclude $@.xsl $${srcdir}$@.in > $@ EXTRA_DIST = $(touchlayouts_in_files) $(common_files) -- cgit v1.2.1