--- a/open-src/lib/libowconfig/Makefile	Wed Nov 12 11:14:21 2014 -0800
+++ b/open-src/lib/libowconfig/Makefile	Sun Nov 23 21:46:46 2014 -0800
@@ -2,7 +2,7 @@
 #
 # libowconfig - library for reading & writing Xsun OWconfig files
 #
-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -42,7 +42,8 @@
 MODULE_VERSION=src
 SOURCE_TARBALL_NAME=NONE
 SOURCE_TARBALL_NAME_SET=yes
-ADDITIONAL_SOURCE_DIR=sun-src
+SOURCE_TARGETS =
+SOURCE_TARGETS_SET=yes
 
 # Library name (used for specfiles/mapfiles)
 LIBNAME=owconfig
@@ -51,14 +52,16 @@
 SUNTOUCHED_MANPAGES= # None
 MODULE_STABILITY=Obsolete
 
-# No configure script to run
-CONFIGURE_TARGETS=
+# No configure script to run, but need to make build dirs
+CONFIGURE_TARGETS = $(BUILD_DIR)
 CONFIGURE_TARGETS_SET=yes
 
 # Since we don't have a configure script, pass configure flags to make
-MODULE_BUILD_MAKEFLAGS=$(CONFIG_ENV) PREFIX=$(MODULE_PREFIX) \
-	X11_INCLUDES_DIR=$(X11_INCLUDES_DIR)
-MODULE_INSTALL_MAKEFLAGS=$(MODULE_BUILD_MAKEFLAGS)
+# and pass path to $(REL_SOURCE_DIR) for makefiles & source files
+REL_SOURCE_DIR = ../sun-src
+MODULE_MAKEFLAGS  = VPATH=$(REL_SOURCE_DIR) -f $(REL_SOURCE_DIR)/Makefile
+MODULE_BUILD_ENV  = $(CONFIG_ENV) PREFIX=$(MODULE_PREFIX)
+MODULE_BUILD_ENV += X11_INCLUDES_DIR=$(X11_INCLUDES_DIR)
 
 # Compatibility links from /usr/X11/lib to /usr/lib
 MODULE_X11_LIBCOMPAT_LINKS = libowconfig.so libowconfig.so.0