mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-22 07:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Define builddir and abs_srcdir when they are missing.

Browse Source 
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
(cherry picked from commit 50aa9533e4)
This commit is contained in:
Richard W.M. Jones
2012-06-17 22:59:46 +01:00
parent 2e219394d6
commit 3d48d4cd81
13 changed files with 46 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
appliance/Makefile.am
View File

@@ -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 builddir.
builddir ?= .
include $(top_srcdir)/subdir-rules.mk
EXTRA_DIST = \

3
clone/Makefile.am
View File

@@ -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
EXTRA_DIST = \

3
inspector/Makefile.am
View File

@@ -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 builddir.
builddir ?= .
include $(top_srcdir)/subdir-rules.mk
EXAMPLE_XML = \

6
java/Makefile.am
View File

@@ -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) \

6
ocaml/Makefile.am
View File

@@ -15,6 +15,12 @@
# 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 ?= .
# Old RHEL 5 autoconf doesn't have abs_srcdir.
abs_srcdir ?= $(shell cd $(top_srcdir)/ocaml && pwd)
include $(top_srcdir)/subdir-rules.mk
generator_built = \

3
php/Makefile.am
View File

@@ -17,6 +17,9 @@
include $(top_srcdir)/subdir-rules.mk
# Old RHEL 5 autoconf doesn't have abs_srcdir.
abs_srcdir ?= $(shell cd $(top_srcdir)/php && pwd)
generator_built = \
extension/php_guestfs_php.h \
extension/guestfs_php.c

2
python/Makefile.am
View File

@@ -16,7 +16,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Old RHEL 5 autoconf doesn't have builddir.
builddir ?= $(top_builddir)/python
builddir ?= .
include $(top_srcdir)/subdir-rules.mk

6
resize/Makefile.am
View File

@@ -15,6 +15,12 @@
# 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 ?= .
# Old RHEL 5 autoconf doesn't have abs_srcdir.
abs_srcdir ?= $(shell cd $(top_srcdir)/resize && pwd)
include $(top_srcdir)/subdir-rules.mk
EXTRA_DIST = \

3
ruby/Makefile.am
View File

@@ -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 builddir.
builddir ?= .
include $(top_srcdir)/subdir-rules.mk
generator_built = \

6
sparsify/Makefile.am
View File

@@ -17,6 +17,12 @@
include $(top_srcdir)/subdir-rules.mk
# Old RHEL 5 autoconf doesn't have builddir.
builddir ?= .
# Old RHEL 5 autoconf doesn't have abs_srcdir.
abs_srcdir ?= $(shell cd $(top_srcdir)/sparsify && pwd)
EXTRA_DIST = \
$(SOURCES) \
virt-sparsify.pod \

6
tests/data/Makefile.am
View File

@@ -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 \

3
tests/extra/Makefile.am
View File

@@ -51,6 +51,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) \

6
tests/guests/Makefile.am
View File

@@ -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 \