4 files changed, 13 insertions(+), 5 deletions(-)
debian/control | 2 +-
debian/pacemaker.dirs | 1 -
debian/pacemaker.install | 1 -
debian/rules | 14 ++++++++++++--
# HG changeset patch
# User Andrew Beekhof <[EMAIL PROTECTED]>
# Date 1226496250 -3600
# Branch stable-1.0
# Node ID 72cc9ef914d749d584b605a36122a95afc3ae411
# Parent 3b32e6fe9f002c748e7c9e561b46274fc6c325d3
Low: Build: Allow debian builds against Whitetank or CoroSync
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Section: admin
Section: admin
Priority: optional
Maintainer: Andrew Beekhof <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5.0.37.2), libglib2.0-dev, python, libtool, libcurl4-openssl-dev | libcurl3-openssl-dev, libxml2-dev, uuid-dev, libbz2-dev, uuid-dev, libltdl3-dev, libgnutls-dev, python-central (>= 0.5), python-dev, libpam0g-dev, libncurses5-dev, libxslt-dev, heartbeat-dev (>= 2.99)
+Build-Depends: debhelper (>= 5.0.37.2), libglib2.0-dev, python, libtool, libcurl4-openssl-dev | libcurl3-openssl-dev, libxml2-dev, uuid-dev, libbz2-dev, uuid-dev, libltdl3-dev, libgnutls-dev, python-central (>= 0.5), python-dev, libpam0g-dev, libncurses5-dev, libxslt-dev, heartbeat-dev (>= 2.99), libopenais-dev
Standards-Version: 3.7.2
XS-Python-Version: current
diff --git a/debian/pacemaker.dirs b/debian/pacemaker.dirs
--- a/debian/pacemaker.dirs
+++ b/debian/pacemaker.dirs
@@ -1,6 +1,5 @@ usr/sbin
usr/sbin
usr/lib/heartbeat
usr/lib
-usr/lib/openais/lcrso
usr/share/heartbeat
usr/share/man/man8
diff --git a/debian/pacemaker.install b/debian/pacemaker.install
--- a/debian/pacemaker.install
+++ b/debian/pacemaker.install
@@ -26,7 +26,6 @@ usr/lib/heartbeat/pengine
usr/lib/heartbeat/pengine
usr/lib/heartbeat/stonithd
usr/lib/heartbeat/stonithdtest/apitest
-usr/lib/openais/lcrso
usr/lib/heartbeat/*.py*
usr/lib/*.so.*
usr/lib/heartbeat/plugins/RAExec/stonith.so*
diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
@@ -8,8 +8,11 @@
# Uncomment this to turn on verbose mode.
export DH_VERBOSE=1
+LCRSO=$(shell if [ -d "/usr/lib/openais/lcrso" ]; then echo /usr/lib/openais/lcrso; else echo /usr/lib/lcrso; fi)
+
cfg:=--prefix=/usr --libdir=/usr/lib --sysconfdir=/etc --localstatedir=/var \
- --mandir=/usr/share/man --with-lcrso-dir=/usr/lib/openais/lcrso
+ --mandir=/usr/share/man --with-lcrso-dir=$(LCRSO) \
+ --disable-fatal-warnings
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
@@ -26,6 +29,7 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_
INSTALL_PROGRAM += -s
endif
+PWD:=`pwd`
DTMP:=`pwd`/debian/tmp
RELEASE := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }')
UPSTREAM := $(shell echo "$(RELEASE)" | sed 's/:\?\([0-9\.]\+\)-[0-9].*/\1/')
@@ -72,7 +76,7 @@ install-stamp:
dh_clean -k
$(MAKE) install DESTDIR=$(DTMP) docdir=/usr/share/doc/pacemaker
-
+
# rename files
-mkdir -p $(DTMP)/usr/share/doc/pacemaker/
mv $(DTMP)/usr/share/pacemaker/cts/README \
@@ -90,6 +94,12 @@ install-stamp:
dh_installdirs
dh_install --source=$(DTMP) --list-missing
+
+# hack around stupid LCRSO dirs
+
+ install -d $(PWD)/debian/pacemaker/$(LCRSO)
+ install -m0644 $(DTMP)/$(LCRSO)/pacemaker.lcrso \
+ $(PWD)/debian/pacemaker/$(LCRSO)/pacemaker.lcrso
binary-indep: build install
dh_testdir -i
_______________________________________________
Pacemaker mailing list
[email protected]
http://list.clusterlabs.org/mailman/listinfo/pacemaker
