Branch b1_6

Fix build after autoMakefile.toplevel.am rename

b=12068

diff --git a/build/autoMakefile.am b/build/autoMakefile.am
index 7a4fc75..484948b 100644 (file)
--- a/build/autoMakefile.am
+++ b/build/autoMakefile.am
@@ -1,5 +1,5 @@
 EXTRA_DIST := Makefile                                         \
 EXTRA_DIST := Makefile                                         \

-       autoMakefile.toplevel.am lbuild linux-merge-config.awk \
+       autoMakefile.am.toplevel lbuild linux-merge-config.awk \

        linux-merge-modules.awk linux-rhconfig.h lmake         \
        lustre-kernel-2.4.spec.in                              \
        suse-functions.sh suse-post.sh suse-postun.sh          \
        linux-merge-modules.awk linux-rhconfig.h lmake         \
        lustre-kernel-2.4.spec.in                              \
        suse-functions.sh suse-post.sh suse-postun.sh          \

diff --git a/build/autoMakefile.am.toplevel b/build/autoMakefile.am.toplevel
index dd87f0e..d1030ff 100644 (file)
--- a/build/autoMakefile.am.toplevel
+++ b/build/autoMakefile.am.toplevel
@@ -64,7 +64,7 @@ dist-hook:
                        -name .#* | xargs rm -rf
 
 EXTRA_DIST = @PACKAGE_TARNAME@.spec                                    \
                        -name .#* | xargs rm -rf
 
 EXTRA_DIST = @PACKAGE_TARNAME@.spec                                    \

-       build/Makefile build/autoMakefile.toplevel.am build/lbuild      \
+       build/Makefile build/autoMakefile.am.toplevel build/lbuild      \

        build/linux-merge-config.awk build/linux-merge-modules.awk      \
        build/linux-rhconfig.h build/lmake build/Rules.in               \
        build/lustre-kernel-2.4.spec.in build/suse-functions.sh         \
        build/linux-merge-config.awk build/linux-merge-modules.awk      \
        build/linux-rhconfig.h build/lmake build/Rules.in               \
        build/lustre-kernel-2.4.spec.in build/suse-functions.sh         \