[vte] Bug 584281 – build: avoid double installation of xterm



commit c38b7315abc067a529f4420ead5bde2b6b25be82
Author: Marc-Andre Lureau <marcandre lureau gmail com>
Date:   Sat May 30 14:06:22 2009 -0400

    Bug 584281 â?? build: avoid double installation of xterm
---
 configure.in         |    1 +
 termcaps/Makefile.am |    6 +++++-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/configure.in b/configure.in
index 9fd93e3..a7542b3 100644
--- a/configure.in
+++ b/configure.in
@@ -264,6 +264,7 @@ emulation=$withval,emulation=xterm)
 AC_DEFINE_UNQUOTED(VTE_DEFAULT_EMULATION,"$emulation",[The default terminal type to be emulated.])
 VTE_DEFAULT_EMULATION=$emulation
 AC_SUBST(VTE_DEFAULT_EMULATION)
+AM_CONDITIONAL(VTE_DEFAULT_EMULATION, [test "$emulation" != xterm])
 
 # Check for headers.
 AC_CHECK_HEADERS(sys/select.h sys/syslimits.h sys/termios.h sys/un.h sys/wait.h stropts.h termios.h wchar.h)
diff --git a/termcaps/Makefile.am b/termcaps/Makefile.am
index 894bd89..6bdd9f6 100644
--- a/termcaps/Makefile.am
+++ b/termcaps/Makefile.am
@@ -1,8 +1,12 @@
 EXTRA_DIST = xterm xterm.baseline
 termcapdir = $(pkgdatadir)/termcap
-termcap_DATA = xterm $(VTE_DEFAULT_EMULATION)
+termcap_DATA = xterm
+
+if VTE_DEFAULT_EMULATION
+termcap_DATA += $(VTE_DEFAULT_EMULATION)
 $(VTE_DEFAULT_EMULATION): xterm
 	sed -e s,^xterm:,$(VTE_DEFAULT_EMULATION):,g \
 	    -e s,^xterm\|,$(VTE_DEFAULT_EMULATION)\|,g $< > $@
+endif
 
 -include $(top_srcdir)/git.mk



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]