X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=config%2Flustre-build.m4;h=d0689378079ffa4bfa1a6881db9bc6668446d029;hp=bdc07370e8689b6cb1e047e0be093c3de96f741e;hb=426194de03ad47497e99d281d86b5cdfc5142148;hpb=fed98fbd8f0c84c8e757bea96bcc7c251b4ffe30

diff --git a/config/lustre-build.m4 b/config/lustre-build.m4
index bdc0737..d068937 100644
--- a/config/lustre-build.m4
+++ b/config/lustre-build.m4
@@ -468,11 +468,11 @@ AC_DEFUN([LB_PATH_DEFAULTS],
 [# directories for binaries
 AC_PREFIX_DEFAULT([/usr])
 
-sysconfdir='/etc'
+sysconfdir='$(CROSS_PATH)/etc'
 AC_SUBST(sysconfdir)
 
 # Directories for documentation and demos.
-docdir='${datadir}/doc/$(PACKAGE)'
+docdir='$(datadir)/doc/$(PACKAGE)'
 AC_SUBST(docdir)
 
 LIBCFS_PATH_DEFAULTS
@@ -539,6 +539,7 @@ AM_CONDITIONAL(DARWIN, test x$lb_target_os = "xdarwin")
 AM_CONDITIONAL(SUNOS, test x$lb_target_os = "xSunOS")
 AM_CONDITIONAL(USES_DPKG, test x$uses_dpkg = "xyes")
 AM_CONDITIONAL(ARCH_x86, test x$target_cpu = "xx86_64" -o x$target_cpu = "xi686")
+AM_CONDITIONAL(ARCH_MIC, test x$target_cpu = "xx86_64" -a x$target_vendor = "xk1om")
 
 # Sanity check for PCLMULQDQ instruction availability
 # PCLMULQDQ instruction is a new instruction available beginning with