Try to fix kext ownership at make install time

diff --git a/build/Rules.in b/build/Rules.in
index 293ff3c..19862f2 100644 (file)
--- a/build/Rules.in
+++ b/build/Rules.in
@@ -23,6 +23,13 @@ ifeq ($(PATCHLEVEL),)
 
 include autoMakefile
 
+fix-kext-ownership:
+       @if test -d $(DESTDIR)$(kextdir) ; then \
+               echo chown -R root:wheel $(DESTDIR)$(kextdir) ; \
+               chown -R root:wheel $(DESTDIR)$(kextdir) || \
+                       echo >&2 "*** WARNING: Could not fix kext ownership for $(DESTDIR)$(kextdir)" ; \
+       fi
+
 else
 
 include @LINUX_CONFIG@

diff --git a/build/autoconf/lustre-build-darwin.m4 b/build/autoconf/lustre-build-darwin.m4
index 2045c6c..084c2cf 100644 (file)
--- a/build/autoconf/lustre-build-darwin.m4
+++ b/build/autoconf/lustre-build-darwin.m4
@@ -69,9 +69,11 @@ KMODEXT=""
 AC_SUBST(EXTRA_KLDFLAGS)
 AC_SUBST(EXTRA_KLIBS)
 
-plistdir='/System/Library/Extensions/$(firstword $(macos_PROGRAMS)).kext/Contents'
+kextdir='/System/Library/Extensions/$(firstword $(macos_PROGRAMS)).kext'
+plistdir='$(kextdir)/Contents'
 macosdir='$(plistdir)/MacOS'
 
+AC_SUBST(kextdir)
 AC_SUBST(plistdir)
 AC_SUBST(macosdir)