From 719a4eb167b15e0d4c81302e539f0cb847d444b8 Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Sat, 22 Dec 2018 23:50:13 -0500
Subject: opkbuild, ob-*: Use variables set by shpp

---
(limited to 'src/ob-buildenv.sh')

diff --git a/src/ob-buildenv.sh b/src/ob-buildenv.sh
index 8f07f8c..70f87a7 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/>.
 
-. '@@LIBDATADIR@@/libopkbuild.shso.1'
+. "${LIBDATADIR}/libopkbuild.shso.1"
 
 main()
 {
@@ -41,8 +41,8 @@ setup_build_helper()
 	for dep in $(ob_get_source_parameter 'Build-Depends'); do
 		unset IFS
 		ob_parse_dep -p dep_pkg "${dep}" >/dev/null
-		if [ -r "@@HELPERDIR@@/${dep_pkg}" ]; then
-			. "@@HELPERDIR@@/${dep_pkg}"
+		if [ -r "${HELPERDIR}/${dep_pkg}" ]; then
+			. "${HELPERDIR}/${dep_pkg}"
 			PATH="${helper_path}:${PATH}"
 		fi
 	done
--
cgit v0.9.1