diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2012-06-17 22:59:46 +0100 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2012-06-18 15:32:47 +0100 |
| commit | 50aa9533e4a505e1c64dbedddb30491bfbb755d6 (patch) | |
| tree | feb5d243609ab2b59ce29b6300a21fba36935499 /tests | |
| parent | dd216fedbdacfd641c2da4073ae26d3ccb6098a6 (diff) | |
| download | libguestfs-50aa9533e4a505e1c64dbedddb30491bfbb755d6.tar.gz libguestfs-50aa9533e4a505e1c64dbedddb30491bfbb755d6.tar.xz libguestfs-50aa9533e4a505e1c64dbedddb30491bfbb755d6.zip | |
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
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/data/Makefile.am | 6 | ||||
| -rw-r--r-- | tests/extra/Makefile.am | 3 | ||||
| -rw-r--r-- | tests/guests/Makefile.am | 6 | ||||
| -rw-r--r-- | tests/xml/Makefile.am | 3 |
4 files changed, 12 insertions, 6 deletions
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am index 85e1f392..fbf74d8b 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -15,10 +15,10 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -include $(top_srcdir)/subdir-rules.mk - # Old RHEL 5 autoconf doesn't have builddir. -builddir ?= $(top_builddir)/tests/data +builddir ?= . + +include $(top_srcdir)/subdir-rules.mk EXTRA_DIST = \ filesanddirs-10M.tar.xz \ diff --git a/tests/extra/Makefile.am b/tests/extra/Makefile.am index 911c83eb..9bcb9881 100644 --- a/tests/extra/Makefile.am +++ b/tests/extra/Makefile.am @@ -48,6 +48,9 @@ # - hard to test because guestmount forks into the background, and # if valgrind reports errors it doesn't stop the test shell script +# Old RHEL 5 autoconf doesn't have abs_srcdir. +abs_srcdir ?= $(shell cd $(top_srcdir)/tests/extra && pwd) + EXTRA_DIST = pick-guests.pl suppressions VG = $(VALGRIND) \ diff --git a/tests/guests/Makefile.am b/tests/guests/Makefile.am index e20d91ca..3e5aea03 100644 --- a/tests/guests/Makefile.am +++ b/tests/guests/Makefile.am @@ -15,10 +15,10 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -include $(top_srcdir)/subdir-rules.mk - # Old RHEL 5 autoconf doesn't have builddir. -builddir ?= $(top_builddir)/tests/guests +builddir ?= . + +include $(top_srcdir)/subdir-rules.mk EXTRA_DIST = \ guest-aux/make-debian-img.sh \ diff --git a/tests/xml/Makefile.am b/tests/xml/Makefile.am index d9abd5cd..f5638fcb 100644 --- a/tests/xml/Makefile.am +++ b/tests/xml/Makefile.am @@ -15,6 +15,9 @@ # 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 abs_srcdir. +abs_srcdir ?= $(shell cd $(top_srcdir)/tests/xml && pwd) + include $(top_srcdir)/subdir-rules.mk if HAVE_LIBVIRT |