--- a/usr/src/lib/libneon/Makefile.sfw	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/libneon/Makefile.sfw	Sat Jan 16 18:11:20 2010 +0200
@@ -19,10 +19,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)Makefile.sfw	1.7	09/09/26 SMI"
+#ident	"@(#)Makefile.sfw	1.8	10/01/04 SMI"
 
 # This makefile is unusual, because it builds both 32 and 64 bit
 # versions of the library.  The builds occur in separate subdirs,
@@ -91,6 +91,20 @@
 CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_POSIX_C_SOURCE=200112L
 CPPFLAGS +=  -D__XOPEN_OR_POSIX
 
+CONFIGURE_COMMON_ARGS = --mandir=/usr/share/man \
+			--localstatedir=/var \
+			--enable-shared \
+			--disable-static \
+			--enable-webdav \
+			--enable-threadsafe-ssl=posix \
+			--enable-nls \
+			--disable-warnings \
+			--disable-ld-version-script \
+			--with-zlib \
+			--with-ssl=openssl \
+			--with-libproxy \
+			--with-libxml2
+
 install: all .WAIT install32 install64
 	INSTDIR=$(DESTDIR) TOP=$(TOP) $(SH) ./install-sfw
 	INSTDIR=$(DESTDIR) TOP=$(TOP) MACH64=$(MACH64) $(SH) ./install-sfw-64
@@ -120,19 +134,7 @@
 	    PATH=$(SFW_PATH) \
 	    "MAKE=$(GMAKE)" \
 	    "PKG_CONFIG_PATH=$(PKG_CONFIG_PATH_32)" \
-	    ./configure --prefix=/usr \
-	    --mandir=/usr/share/man \
-	    --enable-shared \
-	    --disable-static \
-	    --enable-webdav \
-	    --enable-threadsafe-ssl=posix \
-	    --enable-nls \
-	    --disable-warnings \
-	    --disable-ld-version-script \
-	    --with-zlib \
-	    --with-ssl=openssl \
-	    --with-libproxy \
-	    --with-libxml2 )
+	    ./configure --prefix=/usr $(CONFIGURE_COMMON_ARGS) )
 
 $(VER64)/config.status: $(VER64)/configure
 	( cd $(VER64); \
@@ -149,18 +151,7 @@
 	    ./configure --prefix=/usr \
 	    --bindir=/usr/bin/$(MACH64) \
 	    --libdir=/usr/lib/$(MACH64) \
-	    --mandir=/usr/share/man \
-	    --enable-shared \
-	    --disable-static \
-	    --enable-webdav \
-	    --enable-threadsafe-ssl=posix \
-	    --enable-nls \
-	    --disable-warnings \
-	    --disable-ld-version-script \
-	    --with-zlib \
-	    --with-ssl=openssl \
-	    --without-libproxy \
-	    --with-libxml2 )
+	    $(CONFIGURE_COMMON_ARGS) )
 
 $(VER)/configure: $(VER).tar.gz
 	mkdir -p tmp; gzip -dc $(VER).tar.gz | (cd tmp; tar xopf -)