b=20744 hacks for Novell bug 639581

[fs/lustre-release.git] / build / autoMakefile.am.toplevel

diff --git a/build/autoMakefile.am.toplevel b/build/autoMakefile.am.toplevel
index 986e6fc..9806d8d 100644 (file)
--- a/build/autoMakefile.am.toplevel
+++ b/build/autoMakefile.am.toplevel
@@ -148,7 +148,7 @@ debs:
                echo -e "1i\nlustre ($$lversion-1) unstable; urgency=low\n\n  * Automated changelog entry update\n\n -- Brian J. Murrell <brian@interlinx.bc.ca>  $$(date -R)\n\n.\nwq" | ed debian/changelog; \
        fi; \
        if [ -d .git ]; then \
-               ver=$$(git describe --match v\* --tags); \
+               ver=$$(git describe --match [0-9v]\* --tags); \
                if [[ $$ver = *-*-* ]]; then \
                        hash=$${ver##*-}; \
                        ffw=$${ver#*-}; \
@@ -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); \