[gnome-keyring/trust-store] Include Makefile.local into build if it exists
- From: Stefan Walter <stefw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-keyring/trust-store] Include Makefile.local into build if it exists
- Date: Tue, 7 Dec 2010 20:02:41 +0000 (UTC)
commit 7a7058241b2ac601c927ec86656c56944c6b8d78
Author: Stef Walter <stefw collabora co uk>
Date: Tue Dec 7 20:02:17 2010 +0000
Include Makefile.local into build if it exists
.gitignore | 1 +
Makefile.am | 5 +++++
configure.in | 3 +++
3 files changed, 9 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ab6ec39..50059a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,7 @@
stamp-*
Makefile
Makefile.in
+Makefile.local
core
test-suite.[ch]
run-tests
diff --git a/Makefile.am b/Makefile.am
index f9558ea..5356b42 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -75,3 +75,8 @@ clear-coverage:
$(LCOV) --directory . --zerocounters
endif
+
+if WITH_GNU_MAKE
+# Include this local file if it exists
+-include Makefile.local
+endif
\ No newline at end of file
diff --git a/configure.in b/configure.in
index 9f3f293..d5b89f0 100644
--- a/configure.in
+++ b/configure.in
@@ -651,6 +651,9 @@ AC_SUBST(LIBRARY_LIBS)
AC_SUBST(P11_TESTS_CFLAGS)
AC_SUBST(P11_TESTS_LIBS)
+# Are we running with GNU Make?
+AM_CONDITIONAL([WITH_GNU_MAKE], [make --version | grep -q 'GNU Make' > /dev/null])
+
# HACK: Because autoconf is nasty
if test "${prefix}" = "NONE"; then
prefix=/usr/local
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]