Index: lisp-kernel/darwinx8632/Makefile
===================================================================
--- lisp-kernel/darwinx8632/Makefile	(revision 14676)
+++ lisp-kernel/darwinx8632/Makefile	(working copy)
@@ -16,10 +16,8 @@
 
 SVN_REVISION=$(shell svnversion || echo "unknown")
 
-SDKROOT=/Developer/SDKs/MacOSX10.5.sdk
-OSVERSION=10.5
-#SDKROOT=/Developer/SDKs/MacOSX10.6.sdk
-#OSVERSION=10.6
+SDKROOT=$(or $(wildcard /Developer/SDKs/MacOSX10.5.sdk*),$(wildcard /Developer/SDKs/MacOSX10.6.sdk*)) 
+OSVERSION:=$(shell uname -r | sed -e 's/^\([0-9][0-9]*\.[0-9][0-9]*\)\..*/\1/')
 
 MDYNAMIC_NO_PIC = $(shell ($(CC) --help -v 2>&1 | grep -q -e "-mdynamic-no-pic") && /bin/echo "-mdynamic-no-pic")
 
Index: lisp-kernel/darwinx8664/Makefile
===================================================================
--- lisp-kernel/darwinx8664/Makefile	(revision 14676)
+++ lisp-kernel/darwinx8664/Makefile	(working copy)
@@ -16,10 +16,8 @@
 
 SVN_REVISION=$(shell svnversion || echo "unknown")
 
-SDKROOT=/Developer/SDKs/MacOSX10.5.sdk
-OSVERSION=10.5
-#SDKROOT=/Developer/SDKs/MacOSX10.6.sdk
-#OSVERSION=10.6
+SDKROOT=$(or $(wildcard /Developer/SDKs/MacOSX10.5.sdk*),$(wildcard /Developer/SDKs/MacOSX10.6.sdk*)) 
+OSVERSION:=$(shell uname -r | sed -e 's/^\([0-9][0-9]*\.[0-9][0-9]*\)\..*/\1/')
 
 MDYNAMIC_NO_PIC = $(shell ($(CC) --help -v 2>&1 | grep -q -e "-mdynamic-no-pic") && /bin/echo "-mdynamic-no-pic")