bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

GNUmakefile


From: Simon Josefsson
Subject: GNUmakefile
Date: Tue, 08 Nov 2011 21:30:48 +0100
User-agent: Gnus/5.110018 (No Gnus v0.18) Emacs/24.0.91 (gnu/linux)

I upgraded gnulib in GnuTLS and noticed this problem in a clean
checkout:

address@hidden:~/src/gnutls master$ make syntax-check
No version control files detected; skipping syntax check
address@hidden:~/src/gnutls master$ 

The reason was that _build-aux was not set when there was no Makefile.
The else-clause of GNUmakefile needs to set the variables the same way
the non-else clause does.  I've pushed the patch below.

/Simon

>From 92347d72280e77537eede60e16e4630c41f06336 Mon Sep 17 00:00:00 2001
From: Simon Josefsson <address@hidden>
Date: Tue, 8 Nov 2011 21:28:44 +0100
Subject: [PATCH] GNUmakefile: behave when Makefile is missing.

* top/GNUmakefile: Always initialize _build-aux and _autoreconf.
---
 ChangeLog       |    5 +++++
 top/GNUmakefile |    5 +++++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e1d1200..5c0c911 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-08  Simon Josefsson  <address@hidden>
+
+       GNUmakefile: behave when Makefile is missing.
+       * top/GNUmakefile: Always initialize _build-aux and _autoreconf.
+
 2011-11-08  Bruno Haible  <address@hidden>
 
        openat: Conditionalize dependencies.
diff --git a/top/GNUmakefile b/top/GNUmakefile
index ca88b6b..86bc60f 100644
--- a/top/GNUmakefile
+++ b/top/GNUmakefile
@@ -101,6 +101,11 @@ srcdir = .
 
 # The package can override .DEFAULT_GOAL to run actions like autoreconf.
 -include ./cfg.mk
+
+# Allow cfg.mk to override these.
+_build-aux ?= build-aux
+_autoreconf ?= autoreconf -v
+
 include ./maint.mk
 
 ifeq ($(.DEFAULT_GOAL),abort-due-to-no-makefile)
-- 
1.7.2.5




reply via email to

[Prev in Thread] Current Thread [Next in Thread]