-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
According to Jim Meyering on 5/15/2009 7:02 AM:
> FYI, I've just pushed the following.
>
> Bottom line: if you define gnulib_dir to 'gnulib' in cfg.mk,
> you may now remove that definition.
Except that your definition didn't work with VPATH builds. It also risks
issues with CDPATH in $(gnulib-version) (in a non-VPATH build, "cd
./gnulib" is silent, but "cd gnulib" can be vocal or even do the wrong
thing). I'm pushing this followup.
- --
Don't work too hard, make some time for fun as well!
Eric Blake e...@byu.net
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iEYEARECAAYFAkoRUzwACgkQ84KuGfSFAYB4CwCgygHZqf+G5qI2myQtpzv6v9v3
ZdAAn1WqdBDQTT4+rYXU0NIOHPv7AsgA
=IaNZ
-----END PGP SIGNATURE-----
>From 2c9ffa2717e5fa3d4951b589d7a6d871326fa096 Mon Sep 17 00:00:00 2001
From: Eric Blake <e...@byu.net>
Date: Mon, 18 May 2009 06:12:37 -0600
Subject: [PATCH] maint.mk: allow gnulib_dir in VPATH build
* top/maint.mk (gnulib_dir): Make relative to $(srcdir).
Signed-off-by: Eric Blake <e...@byu.net>
---
ChangeLog | 5 +++++
top/maint.mk | 2 +-
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index da51211..a46971a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-18 Eric Blake <e...@byu.net>
+
+ maint.mk: allow gnulib_dir in VPATH build
+ * top/maint.mk (gnulib_dir): Make relative to $(srcdir).
+
2009-05-15 Jim Meyering <meyer...@redhat.com>
maint.mk: Give gnulib_dir a default definition.
diff --git a/top/maint.mk b/top/maint.mk
index d49a092..ed9c1aa 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -638,7 +638,7 @@ built_programs = $$(cd src && MAKEFLAGS= $(MAKE) -s
built_programs.list)
rel-files = $(DIST_ARCHIVES)
-gnulib_dir ?= gnulib
+gnulib_dir ?= $(srcdir)/gnulib
gnulib-version = $$(cd $(gnulib_dir) && git describe)
bootstrap-tools ?= autoconf,automake,gnulib
--
1.6.3.rc3.2.g4b51
