From 443f79077d349db5aa14169a6c5ccf1e4bcd4cf1 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pjm@nac.net>
Date: Sat, 15 Jun 2013 16:57:02 -0400
Subject: Merge branch 'feature/build-system-improvements'.

---
(limited to 'lib/load.sh')

diff --git a/lib/load.sh b/lib/load.sh
index 9a425c1..ac38dbc 100644
--- a/lib/load.sh
+++ b/lib/load.sh
@@ -22,7 +22,7 @@ _OB_LOAD_SM='true'
 
 # The "common" module is used by this and all other modules.
 # We have to manually load the "common" module so we can use it in ob_use.
-. '@@LIBOPKBUILD@@/common.sm'
+. '@@PKGLIBDIR@@/common.sm'
 
 ob_use()
 {
@@ -35,7 +35,7 @@ ob_use()
 		return ${?}
 	fi
 
-	_obu_module='@@LIBOPKBUILD@@'"/${_obu_module}.sm"
+	_obu_module='@@PKGLIBDIR@@'"/${_obu_module}.sm"
 	if [ -r "${_obu_module}" ]; then
 		. "${_obu_module}"
 	else
--
cgit v0.9.1