Fix conditional in Makefile.am: use automake conditional

diff --git a/Makefile.am b/Makefile.am
index e6f7dc117870cdd6aad0d535f161c57e1aa42f8a..6198b841a14cce146963a1836987dc954ff6669c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -69,7 +69,7 @@ synchro: local
        find $(top_srcdir) -name '*~' | xargs rm -fv
        synchro -PD alcyon entretien
 
-ifneq "$(wildcard ~/etc/mes-sites/site.mk)" ""
+if MES_SITES
 
 site: site-all
 
@@ -81,7 +81,7 @@ caption_color = "\#ffffb7"
 LOGOURL = "/logo.gif"
 GOALS = $(wildcard manual/*.html)
 
-include ~/etc/mes-sites/site.mk
+-include ~/etc/mes-sites/site.mk
 
 $(htmldir)/manual/%.html: manual/%.html
        @[ -d $(htmldir)/manual ] || mkdir -v $(htmldir)/manual

diff --git a/configure.ac b/configure.ac
index 8e5177f29ee83a6ba44bd4f42bca575564ce7700..25185e0fc91b355d32e32076b52ea0f0345cd9ec 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -42,6 +42,8 @@ AM_WITH_DMALLOC
 AM_GNU_GETTEXT_VERSION(0.18)
 AM_GNU_GETTEXT(external)
 
+AM_CONDITIONAL(MES_SITES, [test -f "~/etc/mes-sites/site.mk"])
+
 AH_BOTTOM([
 #include "cleaner.h"
 ])