From 8eacedd3b53918c45faa8297ba8196d85a8f4152 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Mon, 3 Mar 2008 17:56:32 +0000 Subject: [PATCH] GNUmakefile build tweaks. * GNUmakefile: When Makefile is not present, make common targets depend on "all" in order to trigger nicer error message. * configure.ac: If autoconf is new enough, link GNUmakefile into VPATH builds. For more details, see . Signed-off-by: Eric Blake --- GNUmakefile | 2 ++ configure.ac | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/GNUmakefile b/GNUmakefile index 49e41b7fff..2fce1fdb7a 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -75,6 +75,8 @@ all: @echo "You must run ./configure before running \`make'." 1>&2 @exit 1 +check dist distcheck install: all + endif # Tell version 3.79 and up of GNU make to not build goals in this diff --git a/configure.ac b/configure.ac index 5c332dbb93..66082783dd 100644 --- a/configure.ac +++ b/configure.ac @@ -333,6 +333,13 @@ AC_SUBST([CONFIG_STATUS_DEPENDENCIES]) AM_GNU_GETTEXT([external], [need-formatstring-macros]) AM_GNU_GETTEXT_VERSION([0.15]) +dnl Allow maintainer rules under GNU make even in VPATH builds. This does +dnl not work in autoconf 2.61 or earlier, but we don't want to require +dnl non-maintainers to use unreleased autoconf, hence the version test. +dnl TODO remove the version check once autoconf 2.62 is released. +m4_if(m4_version_compare([2.61a.100], m4_defn([AC_AUTOCONF_VERSION])), [1], [], + [AC_CONFIG_LINKS([GNUmakefile:GNUmakefile])]) + AC_CONFIG_FILES( Makefile doc/Makefile -- 2.47.3