From 651880308c1fb26071f1f0788e3a9c842d927126 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Wed, 29 Jul 2009 17:04:10 -0700 Subject: [PATCH] Always distribute extras/ezio/ezio3.ti. I had thought that Automake was smart enough to ignore conditionals around EXTRA_DIST, so that all files always got distributed regardless of whether Automake conditionals were set. I was wrong. This pushes the conditionals for building the ezio binaries down into extras/ezio/automake.mk and thereby makes adding ezio3.ti to EXTRA_DIST unconditional, so that it always gets distributed. Otherwise, this file will not be distributed on systems that don't have curses or don't have PCRE, which is very surprising. --- Makefile.am | 4 ---- extras/ezio/automake.mk | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index e9789856d..0b6f00e2d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -64,8 +64,4 @@ include third-party/automake.mk include debian/automake.mk include vswitchd/automake.mk include xenserver/automake.mk -if HAVE_CURSES -if HAVE_PCRE include extras/ezio/automake.mk -endif -endif diff --git a/extras/ezio/automake.mk b/extras/ezio/automake.mk index 2aeaa6440..7c7db2412 100644 --- a/extras/ezio/automake.mk +++ b/extras/ezio/automake.mk @@ -6,6 +6,9 @@ # without warranty of any kind. EXTRA_DIST += extras/ezio/ezio3.ti + +if HAVE_CURSES +if HAVE_PCRE install-data-hook: @echo tic -x $(srcdir)/extras/ezio/ezio3.ti @if ! tic -x $(srcdir)/extras/ezio/ezio3.ti; then \ @@ -47,3 +50,5 @@ extras_ezio_ovs_switchui_LDADD = \ $(PCRE_LIBS) \ $(SSL_LIBS) \ -lm +endif # HAVE_PCRE +endif # HAVE_CURSES -- 2.20.1