5f941c3ead
- Disable OCaml, Ruby bindings, since these can't be built on RHEL 5. - Include upstream patches to fix RHEL 5 build.
43 lines
1.3 KiB
Diff
43 lines
1.3 KiB
Diff
From ebd2da993de7f5a18d4c9aa5ea87b56127e8788c Mon Sep 17 00:00:00 2001
|
|
From: Richard W.M. Jones <rjones@redhat.com>
|
|
Date: Fri, 30 Mar 2012 10:55:52 +0100
|
|
Subject: [PATCH 3/3] RHEL 5: build: Define builddir, abs_srcdir if they don't exist.
|
|
|
|
---
|
|
images/Makefile.am | 3 +++
|
|
perl/Makefile.am | 4 ++++
|
|
2 files changed, 7 insertions(+), 0 deletions(-)
|
|
|
|
diff --git a/images/Makefile.am b/images/Makefile.am
|
|
index 7ae6325..b0087f3 100644
|
|
--- a/images/Makefile.am
|
|
+++ b/images/Makefile.am
|
|
@@ -15,6 +15,9 @@
|
|
# along with this program; if not, write to the Free Software
|
|
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
|
|
+# Old RHEL 5 autoconf doesn't have builddir.
|
|
+builddir ?= $(top_builddir)/images
|
|
+
|
|
EXTRA_DIST = minimal rlenvalue_test_hive
|
|
|
|
# 'large' is a large hive used for testing purposes. It is generated
|
|
diff --git a/perl/Makefile.am b/perl/Makefile.am
|
|
index 1722bcf..22dd98c 100644
|
|
--- a/perl/Makefile.am
|
|
+++ b/perl/Makefile.am
|
|
@@ -15,6 +15,10 @@
|
|
# along with this program; if not, write to the Free Software
|
|
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
|
|
+# Old RHEL 5 autoconf doesn't have builddir or abs_srcdir.
|
|
+builddir ?= $(top_builddir)/perl
|
|
+abs_srcdir ?= $(shell unset CDPATH; cd $(srcdir) && pwd)
|
|
+
|
|
EXTRA_DIST = \
|
|
Makefile.PL.in \
|
|
run-perl-tests \
|
|
--
|
|
1.7.4.1
|
|
|