make "local" *.local files take precedence over those in TOP/..

include CONFIG_SITE.local instead of CONFIG.local at top-level.
Added tag 4.0.2 for changeset af82285f71aa
2014-12-03 16:55:27 +00:00 · 2014-12-03 16:10:25 +00:00 · 2014-11-24 06:55:18 -05:00
2 changed files with 2 additions and 1 deletions
--- a/.hgtags
+++ b/.hgtags
@@ -17,3 +17,4 @@ d70c5ad29163306f50979a95b5aebbe9a93cfe76 2.0-BETA
 9c62aaa83b9db6ad69740a6bb46d6529e0e60b78 4.0.0
 f9f187685032ebf4b108c759be196fda055c9e42 4.0.0
 b0d39d12d743b82038066955db6bb957b1f2f767 4.0.1
+af82285f71aae5d08fa8cf333b03772c5e689aff 4.0.2
--- a/configure/CONFIG_SITE
+++ b/configure/CONFIG_SITE
@@ -20,8 +20,8 @@ CHECK_RELEASE = YES
 #   INSTALL_LOCATION here.
 #INSTALL_LOCATION=</path/name/to/install/top>

+-include $(TOP)/../CONFIG_SITE.local
 -include $(TOP)/configure/CONFIG_SITE.local
-include $(TOP)/../CONFIG.local

 ifdef WITH_COVERAGE
 USR_CPPFLAGS += --coverage
Author	SHA1	Message	Date
dhickin	354fdd412f	make "local" *.local files take precedence over those in TOP/..	2014-12-03 16:55:27 +00:00
dhickin	f3f6141e6a	include CONFIG_SITE.local instead of CONFIG.local at top-level.	2014-12-03 16:10:25 +00:00
Marty Kraimer	b9592eeb8c	Added tag 4.0.2 for changeset af82285f71aa	2014-11-24 06:55:18 -05:00