[PATCH xts 2/2] Fixes for building srcdir != builddir

Jon TURNEY jon.turney at dronecode.org.uk
Wed Jul 28 11:28:35 PDT 2010


Ensure $(builddir)/bin directory exists before trying to create xts-run/xts-config scripts in it
Run xts-config from $(builddir) to create tetexec.cfg

Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
---
 xts5/Makefile.am |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/xts5/Makefile.am b/xts5/Makefile.am
index f17b6ce..17612f7 100644
--- a/xts5/Makefile.am
+++ b/xts5/Makefile.am
@@ -22,12 +22,14 @@ EDIT = $(SED) -e 's,%bindir%,$(bindir),g' \
 	-e 's,%DEFAULT_TET_ROOT%,$(DEFAULT_TET_ROOT),g' \
 	-e 's,%PACKAGE_VERSION%,$(PACKAGE_VERSION),g'
 bin/xts-config: bin/xts-config.in
+	$(AM_V_at)$(MKDIR_P) bin
 	$(AM_V_GEN)$(EDIT) < $< > $@
 bin/xts-run: bin/xts-run.in
+	$(AM_V_at)$(MKDIR_P) bin
 	$(AM_V_GEN)$(EDIT) < $< > $@
 
 # Config file generation for in-tree testing
 XTS_CONFIG = TET_ROOT='$(top_srcdir)' XSET='$(XSET)' XDPYINFO='$(XDPYINFO)' \
-	$(PERL) -p $(srcdir)/bin/xts-config
-tetexec.cfg: tetexec.cfg.in $(srcdir)/bin/xts-config
+	$(PERL) -p $(builddir)/bin/xts-config
+tetexec.cfg: tetexec.cfg.in $(builddir)/bin/xts-config
 	$(AM_V_GEN)$(XTS_CONFIG) < $< > $@.tmp && mv -f $@.tmp $@ || rm -f $@.tmp
-- 
1.7.0.4



More information about the xorg-devel mailing list