diff options
| -rw-r--r-- | autoconf/Makefile.am | 1 | ||||
| -rwxr-xr-x | autogen.sh | 10 | ||||
| -rw-r--r-- | config/Makefile.am | 3 | ||||
| -rw-r--r-- | config/kernel (renamed from configs/kernel) | 0 | ||||
| -rw-r--r-- | config/lustre (renamed from configs/lustre) | 0 | ||||
| -rw-r--r-- | config/user (renamed from configs/user) | 0 | ||||
| -rw-r--r-- | config/zfs-build.m4 (renamed from autoconf/zfs-build.m4) | 6 | ||||
| -rw-r--r-- | configs/Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 2 |
9 files changed, 11 insertions, 12 deletions
diff --git a/autoconf/Makefile.am b/autoconf/Makefile.am deleted file mode 100644 index 688e8fda4..000000000 --- a/autoconf/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = zfs-build.m4 diff --git a/autogen.sh b/autogen.sh index 7834426bb..72bba5b03 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,10 +1,8 @@ #!/bin/sh -find . -type d -name .deps | xargs rm -rf -rm -rf config.guess config.sub ltmain.sh -libtoolize --automake -aclocal -I autoconf 2>/dev/null && +aclocal -I config && +libtoolize --automake --copy autoheader && -automake --add-missing --include-deps # 2>/dev/null && +automake --add-missing --include-deps 2>/dev/null autoconf - +rm -rf autom4te.cache aclocal.m4 diff --git a/config/Makefile.am b/config/Makefile.am new file mode 100644 index 000000000..d1fde7bb4 --- /dev/null +++ b/config/Makefile.am @@ -0,0 +1,3 @@ +EXTRA_DIST = zfs-build.m4 +EXTRA_DIST = kernel user lustre + diff --git a/configs/kernel b/config/kernel index fc1dfa3c5..fc1dfa3c5 100644 --- a/configs/kernel +++ b/config/kernel diff --git a/configs/lustre b/config/lustre index 65b1603ee..65b1603ee 100644 --- a/configs/lustre +++ b/config/lustre diff --git a/configs/user b/config/user index f79ba8fa8..f79ba8fa8 100644 --- a/configs/user +++ b/config/user diff --git a/autoconf/zfs-build.m4 b/config/zfs-build.m4 index 773d42832..5eebdd48e 100644 --- a/autoconf/zfs-build.m4 +++ b/config/zfs-build.m4 @@ -6,15 +6,15 @@ AC_DEFUN([ZFS_AC_CONFIG], [ [zfsconfig="$withval"]) AC_MSG_CHECKING([zfs config file]) - if test -z "$zfsconfig" || test ! -r configs/$zfsconfig; then + if test -z "$zfsconfig" || test ! -r config/$zfsconfig; then AC_MSG_RESULT([no]) AC_MSG_ERROR([ *** Please specify one of the valid config files located - *** in ./configs/ with the '--with-zfs-config=CONFIG' option]) + *** in ./config/ with the '--with-zfs-config=CONFIG' option]) fi AC_MSG_RESULT([$zfsconfig]); - . ./configs/$zfsconfig + . ./config/$zfsconfig TOPDIR=`/bin/pwd` ZFSDIR=${TOPDIR}/$BUILDDIR diff --git a/configs/Makefile.am b/configs/Makefile.am deleted file mode 100644 index 326b3d760..000000000 --- a/configs/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST=kernel user lustre diff --git a/configure.ac b/configure.ac index 7d099854b..18cbb43ec 100644 --- a/configure.ac +++ b/configure.ac @@ -138,7 +138,7 @@ AC_SUBST(HOSTCFLAGS) AC_CONFIG_FILES([ Makefile autoconf/Makefile - configs/Makefile + config/Makefile doc/Makefile scripts/Makefile zfs/Makefile |