From 8676a24a65b38ffc2812f1370d1f684e305d7a21 Mon Sep 17 00:00:00 2001 From: "Brian J. Murrell" Date: Mon, 18 Oct 2010 14:10:49 -0400 Subject: [PATCH] explicitly set KVERS; allow all automake packages Explicitly set KVERS to what it'd default value would be if it's not set by the caller. Allow any of the compatible automake* packages in debian/control. --- build/autoMakefile.am.toplevel | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build/autoMakefile.am.toplevel b/build/autoMakefile.am.toplevel index 986e6fc..5ed02a7 100644 --- a/build/autoMakefile.am.toplevel +++ b/build/autoMakefile.am.toplevel @@ -211,6 +211,7 @@ debs: ln -s /usr/share/modass/packages/ usr_share_modass/ && \ echo "lustre" > usr_share_modass/compliant.list && \ export MA_DIR=$$(pwd)/usr_share_modass && \ + KVERS=$${KVERS:-$(LINUXRELEASE)}; \ m-a build $${KVERS:+-l $$KVERS} -i -u $$(pwd) lustre && \ popd && \ VER=$$(sed -ne '1s/^lustre (\(.*-[0-9][0-9]*\)).*$$/\1/p' debian/changelog); \ diff --git a/debian/control b/debian/control index 81e7520..306f7c9 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Brian J. Murrell Uploaders: Brian J. Murrell Standards-Version: 3.8.3 -Build-Depends: libreadline-dev, debhelper (>=5.0.0), dpatch, automake (>=1.7), libsnmp-dev, bzip2, quilt, texlive-latex-recommended, linux-headers-generic | linux-headers, rsync +Build-Depends: libreadline-dev, debhelper (>=5.0.0), dpatch, automake (>=1.7) | automake1.7 | automake1.8 | automake1.9, libsnmp-dev, bzip2, quilt, texlive-latex-recommended, linux-headers-generic | linux-headers, rsync Homepage: http://www.lustre.org/ Vcs-Cvs: -d :pserver:anonymous@cvs.lustre.org:/lustre -- 1.8.3.1