From 50aa9533e4a505e1c64dbedddb30491bfbb755d6 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 17 Jun 2012 22:59:46 +0100 Subject: build: Define builddir and abs_srcdir when they are missing. RHEL 5-era autoconf did not define these, so define them manually when they are missing. Define builddir as '.' The scripts require this. It won't work in the srcdir != builddir case, but we don't care about that for RHEL 5. This commit also moves the builddir / abs_srcdir variable setting above the include of subdir-rules.mk, in case that include uses these variables. Useful script: for f in $(find -name Makefile.am | xargs fgrep '$(abs_srcdir)' -l) ; do if ! grep -q '^abs_srcdir' $f; then echo missing in $f fi done --- java/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'java') diff --git a/java/Makefile.am b/java/Makefile.am index 2a8b77b8..613aac92 100644 --- a/java/Makefile.am +++ b/java/Makefile.am @@ -15,13 +15,13 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# Old RHEL 5 autoconf doesn't have builddir. +builddir ?= . + include $(top_srcdir)/subdir-rules.mk java_prefix = com/redhat/et/libguestfs -# Old RHEL 5 autoconf doesn't have builddir. -builddir ?= $(top_builddir)/java - generator_built = \ Makefile.inc \ $(java_built_sources) \ -- cgit