From 536640fe2908070f22d340ec23cfa9224df97aa3 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 24 Nov 2008 11:56:48 -0800 Subject: [PATCH] Minor autoconf build fixes: Fixed BUILDDIR in config/* Added missing " to ZFS_AC_SCRIPT_CONFIG macro Removed autoconf/Makefile --- config/kernel | 4 ++-- config/lustre | 2 +- config/user | 2 +- config/zfs-build.m4 | 6 +++--- configure.ac | 1 - 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/config/kernel b/config/kernel index fc1dfa3c59..0ffcc6fa6f 100644 --- a/config/kernel +++ b/config/kernel @@ -2,10 +2,10 @@ UNAME=`uname -r | cut -d- -f1` -CONFIG=user +CONFIG=kernel NAME=zfs BRANCH=`awk '/[Bb]ranch:/ {print $$2}' META` VERSION=`awk '/[Vv]ersion:/ {print $$2}' META` RELEASE=`awk '/[Rr]elease:/ {print $$2}' META` -BUILDDIR=$NAME+$CONFIG +BUILDDIR=$NAME #+$CONFIG diff --git a/config/lustre b/config/lustre index 65b1603eee..e3daba9081 100644 --- a/config/lustre +++ b/config/lustre @@ -8,4 +8,4 @@ NAME=zfs BRANCH=`awk '/[Bb]ranch:/ {print $$2}' META` VERSION=`awk '/[Vv]ersion:/ {print $$2}' META` RELEASE=`awk '/[Rr]elease:/ {print $$2}' META` -BUILDDIR=$NAME+$CONFIG +BUILDDIR=$NAME #+$CONFIG diff --git a/config/user b/config/user index f79ba8fa8e..2061d3d77d 100644 --- a/config/user +++ b/config/user @@ -6,4 +6,4 @@ NAME=zfs BRANCH=`awk '/[Bb]ranch:/ {print $$2}' META` VERSION=`awk '/[Vv]ersion:/ {print $$2}' META` RELEASE=`awk '/[Rr]elease:/ {print $$2}' META` -BUILDDIR=$NAME+$CONFIG +BUILDDIR=$NAME #+$CONFIG diff --git a/config/zfs-build.m4 b/config/zfs-build.m4 index 5eebdd48e2..a268e59860 100644 --- a/config/zfs-build.m4 +++ b/config/zfs-build.m4 @@ -243,9 +243,9 @@ AC_DEFUN([ZFS_AC_SCRIPT_CONFIG], [ echo "ZFSSRC=${TOPDIR}/src" >>${SCRIPT_CONFIG} echo "ZFSBUILD=${ZFSDIR}" >>${SCRIPT_CONFIG} echo >>${SCRIPT_CONFIG} - echo "TOPDIR=${TOPDIR} >>${SCRIPT_CONFIG} - echo "LIBDIR=${LIBDIR} >>${SCRIPT_CONFIG} - echo "CMDDIR=${CMDDIR} >>${SCRIPT_CONFIG} + echo "TOPDIR=${TOPDIR}" >>${SCRIPT_CONFIG} + echo "LIBDIR=${LIBDIR}" >>${SCRIPT_CONFIG} + echo "CMDDIR=${CMDDIR}" >>${SCRIPT_CONFIG} ]) dnl # diff --git a/configure.ac b/configure.ac index 83efa0c8c9..8bc8a54ea7 100644 --- a/configure.ac +++ b/configure.ac @@ -139,7 +139,6 @@ AC_SUBST(KERNELCPPFLAGS) AC_SUBST(HOSTCFLAGS) AC_CONFIG_FILES([ Makefile - autoconf/Makefile config/Makefile doc/Makefile scripts/Makefile