Branch b1_6

Rename autoMakefile.toplevel.am back to autoMakefile.am.toplevel to fix
other branches (the top level lustre module is shared between most
branches, unfortunately.)

b=12068

diff --git a/autoMakefile.am b/autoMakefile.am
index d9d97dd..a2ad3f6 100644 (file)
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -3,7 +3,7 @@ DIST_SUBDIRS := @SNMP_DIST_SUBDIR@ libsysio ldiskfs lnet lustre
 SOURCES_SUBDIRS := @LDISKFS_SUBDIR@ lnet lustre
 RPM_SUBDIRS := @LDISKFS_SUBDIR@
 
-include build/autoMakefile.toplevel.am
+include build/autoMakefile.am.toplevel
 
 EXTRA_DIST += config.h.in
 

diff --git a/build/autoMakefile.toplevel.am b/build/autoMakefile.am.toplevel
similarity index 100%
rename from build/autoMakefile.toplevel.am
rename to build/autoMakefile.am.toplevel

diff --git a/ldiskfs/autoMakefile.am b/ldiskfs/autoMakefile.am
index b73008e..9e9a2cd 100644 (file)
--- a/ldiskfs/autoMakefile.am
+++ b/ldiskfs/autoMakefile.am
@@ -2,6 +2,6 @@ SUBDIRS := . ldiskfs
 SOURCES_SUBDIRS := ldiskfs
 DIST_SUBDIRS := ldiskfs
 
-include build/autoMakefile.toplevel.am
+include build/autoMakefile.am.toplevel
 
 EXTRA_DIST += kernel_patches