[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] gnumakefile: work without maintainer-makefile
From: |
Eric Blake |
Subject: |
[PATCH] gnumakefile: work without maintainer-makefile |
Date: |
Wed, 20 Jun 2012 11:43:57 -0600 |
With gnumakefile being an independent module from maintainer-makefile,
we shouldn't have a hard requirement on maint.mk.
* top/GNUmakefile: Let maint.mk be optional.
Reported by Simon Josefsson.
Signed-off-by: Eric Blake <address@hidden>
---
This is an alternative to merging the 'gnumakefile' and
'maintainer-makefile' modules. I'm posting it more as a
demonstration that it is possible, because I personally like
the idea of the module merge.
ChangeLog | 6 ++++++
top/GNUmakefile | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 9820d7c..c8983bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-06-20 Eric Blake <address@hidden>
+
+ gnumakefile: work without maintainer-makefile
+ * top/GNUmakefile: Let maint.mk be optional.
+ Reported by Simon Josefsson.
+
2012-05-29 Paul Eggert <address@hidden>
system-quote-tests: port to CentOS 5
diff --git a/top/GNUmakefile b/top/GNUmakefile
index 58f2ead..93ba110 100644
--- a/top/GNUmakefile
+++ b/top/GNUmakefile
@@ -40,7 +40,7 @@ include Makefile
_build-aux ?= build-aux
_autoreconf ?= autoreconf -v
-include $(srcdir)/maint.mk
+-include $(srcdir)/maint.mk
# Ensure that $(VERSION) is up to date for dist-related targets, but not
# for others: rerunning autoreconf and recompiling everything isn't cheap.
--
1.7.10.2