From 20c66a1eaef872dbfad4ba82d2ca1c74eb4c9818 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pjm@nac.net>
Date: Sat, 01 Mar 2014 19:40:11 -0500
Subject: Merge branch 'feature/autoconf-and-automake'.

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

diff --git a/lib/load.sh b/lib/load.sh
index a21ca52..d537b4b 100644
--- a/lib/load.sh
+++ b/lib/load.sh
@@ -22,7 +22,7 @@ _OH_LOAD_SM=1
 
 # 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.
-. '@@PKGLIBDIR@@/common.sm'
+. '@pkgdatadir@/common.sm'
 
 oh_use()
 {
@@ -34,7 +34,7 @@ oh_use()
 		return 125
 	fi
 
-	module='@@PKGLIBDIR@@'"/${module}.sm"
+	module='@pkgdatadir@'"/${module}.sm"
 	if [ -r "${module}" ]; then
 		. "${module}"
 	else
--
cgit v0.9.1