From 19b65e13fa6a38be577ecd9d5d604772d77d2748 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pjm@nac.net>
Date: Thu, 09 May 2013 14:15:01 -0400
Subject: s/@@LIBOPKHELPER@@/@@PKGLIBDIR@@/ in sources.

---
diff --git a/lib/load.sh b/lib/load.sh
index 0b54f4a..4c3f822 100644
--- a/lib/load.sh
+++ b/lib/load.sh
@@ -22,7 +22,7 @@ _OH_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 oh_use.
-. '@@LIBOPKHELPER@@/common.sm'
+. '@@PKGLIBDIR@@/common.sm'
 
 # Assume that every library module and utility uses libopkbuild.
 . '@@LIBOPKBUILD_1@@/load.sm'
@@ -38,7 +38,7 @@ oh_use()
 		return ${?}
 	fi
 
-	_ohu_module='@@LIBOPKHELPER@@'"/${_ohu_module}.sm"
+	_ohu_module='@@PKGLIBDIR@@'"/${_ohu_module}.sm"
 	if [ -r "${_ohu_module}" ]; then
 		. "${_ohu_module}"
 	else
diff --git a/src/oh-architecture.sh b/src/oh-architecture.sh
index 113854f..b026185 100644
--- a/src/oh-architecture.sh
+++ b/src/oh-architecture.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/>.
 
-. '@@LIBOPKHELPER@@/load.sm'
+. '@@PKGLIBDIR@@/load.sm'
 
 oh_use buildsystem
 
diff --git a/src/oh-autobuild.sh b/src/oh-autobuild.sh
index 3bf2026..c85dd0f 100644
--- a/src/oh-autobuild.sh
+++ b/src/oh-autobuild.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/>.
 
-. '@@LIBOPKHELPER@@/load.sm'
+. '@@PKGLIBDIR@@/load.sm'
 
 oh_use buildsystem
 
diff --git a/src/oh-autoclean.sh b/src/oh-autoclean.sh
index f12815b..cf9c8d3 100644
--- a/src/oh-autoclean.sh
+++ b/src/oh-autoclean.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/>.
 
-. '@@LIBOPKHELPER@@/load.sm'
+. '@@PKGLIBDIR@@/load.sm'
 
 oh_use buildsystem
 
diff --git a/src/oh-autoconfigure.sh b/src/oh-autoconfigure.sh
index d363278..3e37228 100644
--- a/src/oh-autoconfigure.sh
+++ b/src/oh-autoconfigure.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/>.
 
-. '@@LIBOPKHELPER@@/load.sm'
+. '@@PKGLIBDIR@@/load.sm'
 
 oh_use buildsystem
 
diff --git a/src/oh-autoinstall.sh b/src/oh-autoinstall.sh
index bd4476a..efe8500 100644
--- a/src/oh-autoinstall.sh
+++ b/src/oh-autoinstall.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/>.
 
-. '@@LIBOPKHELPER@@/load.sm'
+. '@@PKGLIBDIR@@/load.sm'
 
 oh_use buildsystem
 
diff --git a/src/oh-autotest.sh b/src/oh-autotest.sh
index 371328c..aff0999 100644
--- a/src/oh-autotest.sh
+++ b/src/oh-autotest.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/>.
 
-. '@@LIBOPKHELPER@@/load.sm'
+. '@@PKGLIBDIR@@/load.sm'
 
 oh_use buildsystem
 
diff --git a/src/oh-fixperms.sh b/src/oh-fixperms.sh
index d8f3886..308e60a 100644
--- a/src/oh-fixperms.sh
+++ b/src/oh-fixperms.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/>.
 
-. '@@LIBOPKHELPER@@/load.sm'
+. '@@PKGLIBDIR@@/load.sm'
 
 main()
 {
diff --git a/src/oh-installfiles.sh b/src/oh-installfiles.sh
index c9abd36..9848ca1 100644
--- a/src/oh-installfiles.sh
+++ b/src/oh-installfiles.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/>.
 
-. '@@LIBOPKHELPER@@/load.sm'
+. '@@PKGLIBDIR@@/load.sm'
 
 files_ifs='
 '
diff --git a/src/oh-strip.sh b/src/oh-strip.sh
index 96c4d3f..1c21545 100644
--- a/src/oh-strip.sh
+++ b/src/oh-strip.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/>.
 
-. '@@LIBOPKHELPER@@/load.sm'
+. '@@PKGLIBDIR@@/load.sm'
 
 CR='
 '
--
cgit v0.9.1