[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] build: correct my change of 2011-01-28
From: |
Jim Meyering |
Subject: |
[PATCH] build: correct my change of 2011-01-28 |
Date: |
Sat, 19 Mar 2011 18:22:36 +0100 |
Somehow I missed this warning:
Makefile:1522: warning: overriding recipe for target `dist-hook'
Makefile:1518: warning: ignoring old recipe for target `dist-hook'
Here's the fix:
>From 2b0096f64c460e53118835238c01afde0ac508e8 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sat, 19 Mar 2011 17:43:56 +0100
Subject: [PATCH] build: correct my change of 2011-01-28
Do not override original dist-hook rule.
* Makefile.am (run-syntax-check): Rename from overriding dist-hook.
(dist-hook): Depend on run-syntax-check.
---
Makefile.am | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index a702c2e..a13f262 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,15 +28,16 @@ EXTRA_DIST = \
TODO \
cfg.mk
+# Run syntax-check rules before creating a distribution tarball.
+.PHONY: run-syntax-check
+run-syntax-check:
+ $(AM_V_GEN)test -d .git && $(MAKE) syntax-check || :
+
# Arrange so that .tarball-version appears only in the distribution
# tarball, and never in a checked-out repository.
-dist-hook: gen-ChangeLog
+dist-hook: gen-ChangeLog run-syntax-check
$(AM_V_GEN)echo $(VERSION) > $(distdir)/.tarball-version
-# Run syntax-check rules before creating a distribution tarball.
-dist-hook:
- $(AM_V_GEN)test -d .git && $(MAKE) syntax-check || :
-
gen_start_date = 2009-11-27
.PHONY: gen-ChangeLog
gen-ChangeLog:
--
1.7.4.1.499.g53f9
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [PATCH] build: correct my change of 2011-01-28,
Jim Meyering <=