From fde3be375270c3df012a6dab3a57286cd941c86e Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pjm@nac.net>
Date: Sat, 15 Jun 2013 16:04:19 -0400
Subject: s/@@LIBOPKBUILD@@/@@PKGLIBDIR@@/ in sources.

---
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
diff --git a/src/ob-applypatches.sh b/src/ob-applypatches.sh
index 66f41da..a522238 100644
--- a/src/ob-applypatches.sh
+++ b/src/ob-applypatches.sh
@@ -19,7 +19,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-. '@@LIBOPKBUILD@@/load.sm'
+. '@@PKGLIBDIR@@/load.sm'
 
 ob_use locale
 ob_use output
diff --git a/src/ob-buildenv.sh b/src/ob-buildenv.sh
index 1cfa66c..e02c19a 100644
--- a/src/ob-buildenv.sh
+++ b/src/ob-buildenv.sh
@@ -19,7 +19,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-. '@@LIBOPKBUILD@@/load.sm'
+. '@@PKGLIBDIR@@/load.sm'
 
 ob_use locale
 ob_use output
diff --git a/src/ob-buildopk.sh b/src/ob-buildopk.sh
index 4f947f8..264e532 100644
--- a/src/ob-buildopk.sh
+++ b/src/ob-buildopk.sh
@@ -19,7 +19,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-. '@@LIBOPKBUILD@@/load.sm'
+. '@@PKGLIBDIR@@/load.sm'
 
 ob_use locale
 ob_use output
diff --git a/src/ob-checkbuilddeps.sh b/src/ob-checkbuilddeps.sh
index 1c39067..be7b875 100644
--- a/src/ob-checkbuilddeps.sh
+++ b/src/ob-checkbuilddeps.sh
@@ -19,7 +19,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-. '@@LIBOPKBUILD@@/load.sm'
+. '@@PKGLIBDIR@@/load.sm'
 
 ob_use locale
 ob_use output
diff --git a/src/ob-gencontrol.sh b/src/ob-gencontrol.sh
index 16eec5d..542117d 100644
--- a/src/ob-gencontrol.sh
+++ b/src/ob-gencontrol.sh
@@ -19,7 +19,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-. '@@LIBOPKBUILD@@/load.sm'
+. '@@PKGLIBDIR@@/load.sm'
 
 ob_use locale
 ob_use output
diff --git a/src/ob-installdocs.sh b/src/ob-installdocs.sh
index d415909..5cd49a9 100644
--- a/src/ob-installdocs.sh
+++ b/src/ob-installdocs.sh
@@ -19,7 +19,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-. '@@LIBOPKBUILD@@/load.sm'
+. '@@PKGLIBDIR@@/load.sm'
 
 ob_use locale
 ob_use output
diff --git a/src/ob-installplatconf.sh b/src/ob-installplatconf.sh
index 9458f91..5a29442 100644
--- a/src/ob-installplatconf.sh
+++ b/src/ob-installplatconf.sh
@@ -19,7 +19,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-. '@@LIBOPKBUILD@@/load.sm'
+. '@@PKGLIBDIR@@/load.sm'
 
 ob_use locale
 ob_use output
diff --git a/src/ob-unpacksource.sh b/src/ob-unpacksource.sh
index 78ed4e0..07c8d48 100644
--- a/src/ob-unpacksource.sh
+++ b/src/ob-unpacksource.sh
@@ -19,7 +19,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-. '@@LIBOPKBUILD@@/load.sm'
+. '@@PKGLIBDIR@@/load.sm'
 
 ob_use locale
 ob_use output
diff --git a/src/opkbuild.sh b/src/opkbuild.sh
index c6f6fc7..a3ad831 100644
--- a/src/opkbuild.sh
+++ b/src/opkbuild.sh
@@ -19,7 +19,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-. '@@LIBOPKBUILD@@/load.sm'
+. '@@PKGLIBDIR@@/load.sm'
 
 ob_use locale
 ob_use output
--
cgit v0.9.1