diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2010-07-28 19:28:35 +0100 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-07-29 08:43:47 +1000 |
| commit | 4f4d1da480cf5d073031e8ec0c301e6ef4168270 (patch) | |
| tree | 9fcf1322cd9b10d7c9b47a3d65ffe8c6f8ec9511 | |
| parent | 3bc1747dbe00522e2d9c264d23a5b299e3d92291 (diff) | |
Fixes for building srcdir != builddir
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@dronecode.org.uk>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | xts5/Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xts5/Makefile.am b/xts5/Makefile.am index f17b6ce3..17612f76 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 |