Merge branch 'feature/drop-libopkbuild-dep'.

Conflicts:
	configure

9 files changed, 19 insertions, 19 deletions

diff --git a/src/oh-architecture.sh b/src/oh-architecture.sh
index b026185..4ba5929 100644
--- a/src/oh-architecture.sh
+++ b/src/oh-architecture.sh
@@ -39,7 +39,7 @@ main()
 				oh_set_buildsystem_option 'build-dir' "${OPTARG}"
 				;;
 			?)
-				ob_error "$(ob_get_msg 'bad_opt')"
+				oh_error "$(oh_get_msg 'bad_opt')"
 				exit 1
 				;;
 		esac
diff --git a/src/oh-autobuild.sh b/src/oh-autobuild.sh
index c85dd0f..cc365bc 100644
--- a/src/oh-autobuild.sh
+++ b/src/oh-autobuild.sh
@@ -42,7 +42,7 @@ main()
 				oh_set_buildsystem_option 'build-target' "${OPTARG}"
 				;;
 			?)
-				ob_error "$(ob_get_msg 'bad_opt')"
+				oh_error "$(oh_get_msg 'bad_opt')"
 				exit 1
 				;;
 		esac
diff --git a/src/oh-autoclean.sh b/src/oh-autoclean.sh
index cf9c8d3..b57b6f1 100644
--- a/src/oh-autoclean.sh
+++ b/src/oh-autoclean.sh
@@ -39,7 +39,7 @@ main()
 				oh_set_buildsystem_option 'build-dir' "${OPTARG}"
 				;;
 			?)
-				ob_error "$(ob_get_msg 'bad_opt')"
+				oh_error "$(oh_get_msg 'bad_opt')"
 				exit 1
 				;;
 		esac
diff --git a/src/oh-autoconfigure.sh b/src/oh-autoconfigure.sh
index 3e37228..af18b87 100644
--- a/src/oh-autoconfigure.sh
+++ b/src/oh-autoconfigure.sh
@@ -42,7 +42,7 @@ main()
 				oh_set_buildsystem_option 'target-arch' "${OPTARG}"
 				;;
 			?)
-				ob_error "$(ob_get_msg 'bad_opt')"
+				oh_error "$(oh_get_msg 'bad_opt')"
 				exit 1
 				;;
 		esac
diff --git a/src/oh-autoinstall.sh b/src/oh-autoinstall.sh
index efe8500..6dbb532 100644
--- a/src/oh-autoinstall.sh
+++ b/src/oh-autoinstall.sh
@@ -45,7 +45,7 @@ main()
 				oh_set_buildsystem_option 'build-target' "${OPTARG}"
 				;;
 			?)
-				ob_error "$(ob_get_msg 'bad_opt')"
+				oh_error "$(oh_get_msg 'bad_opt')"
 				exit 1
 				;;
 		esac
diff --git a/src/oh-autotest.sh b/src/oh-autotest.sh
index aff0999..f11414d 100644
--- a/src/oh-autotest.sh
+++ b/src/oh-autotest.sh
@@ -36,7 +36,7 @@ main()
 				oh_set_buildsystem_option 'build-dir' "${OPTARG}"
 				;;
 			?)
-				ob_error "$(ob_get_msg 'bad_opt')"
+				oh_error "$(oh_get_msg 'bad_opt')"
 				exit 1
 				;;
 		esac
diff --git a/src/oh-fixperms.sh b/src/oh-fixperms.sh
index 308e60a..71dda4d 100644
--- a/src/oh-fixperms.sh
+++ b/src/oh-fixperms.sh
@@ -33,34 +33,34 @@ main()
 				dir="${OPTARG}"
 				;;
 			?)
-				ob_error "$(ob_get_msg 'bad_opt')"
+				oh_error "$(oh_get_msg 'bad_opt')"
 				exit 1
 				;;
 		esac
 	done
 
 	# Ensure that everything is owned by UID 0 and GID 0.
-	ob_info "$(ob_get_msg 'chown')"
+	oh_info "$(oh_get_msg 'chown')"
 	find "${dir}" \
 		-exec 'chown' '-h' '0:0' '{}' ';'
 
 	# Ensure that shared libraries, static libraries, and libtool archives have
 	# a rw-r--r-- mode.
-	ob_info "$(ob_get_msg 'chmod_lib')"
+	oh_info "$(oh_get_msg 'chmod_lib')"
 	find "${dir}" -type f -a ! -perm 644 \
 		-a \( -name '*.so*' -o -name '*.a' -o -name '*.la' \) \
 		-exec 'chmod' '644' '{}' ';'
 
 	# Ensure that header files have a rw-r--r-- mode.
 	if [ -d "${dir}/usr/include" ]; then
-		ob_info "$(ob_get_msg 'chmod_include')"
+		oh_info "$(oh_get_msg 'chmod_include')"
 		find "${dir}/usr/include" -type f -a ! -perm 644 \
 			-exec 'chmod' '644' '{}' ';'
 	fi
 
 	# Ensure that manual pages have a rw-r--r-- mode.
 	if [ -d "${dir}/usr/share/man" ]; then
-		ob_info "$(ob_get_msg 'chmod_man')"
+		oh_info "$(oh_get_msg 'chmod_man')"
 		find "${dir}/usr/share/man" -type f -a ! -perm 644 \
 			-exec 'chmod' '644' '{}' ';'
 	fi
@@ -68,7 +68,7 @@ main()
 	# Ensure that binary programs and service scripts have a rwxr-xr-x mode.
 	for bindir in /usr/sbin /usr/bin /sbin /bin /usr/games /etc/init.d; do
 		if [ -d "${dir}/${bindir}" ]; then
-			ob_info "$(ob_get_msg 'chmod_bin')" "${bindir}"
+			oh_info "$(oh_get_msg 'chmod_bin')" "${bindir}"
 			find "${dir}/${bindir}" -type f -a ! -perm 755 \
 				-exec 'chmod' '755' '{}' ';'
 		fi
diff --git a/src/oh-installfiles.sh b/src/oh-installfiles.sh
index 9848ca1..0cdfecf 100644
--- a/src/oh-installfiles.sh
+++ b/src/oh-installfiles.sh
@@ -36,7 +36,7 @@ main()
 				dir="${OPTARG}"
 				;;
 			?)
-				ob_error "$(ob_get_msg 'bad_opt')"
+				oh_error "$(oh_get_msg 'bad_opt')"
 				exit 1
 				;;
 		esac
@@ -45,7 +45,7 @@ main()
 	for pkg in ${OPK_PACKAGES}; do
 		[ -r "../${pkg}.pkg/files" ] || continue
 
-		ob_info "$(ob_get_msg 'installing_files')" "${pkg}"
+		oh_info "$(oh_get_msg 'installing_files')" "${pkg}"
 
 		mkdir -p "${pkg}.data"
 		chmod 755 "${pkg}.data"
@@ -63,7 +63,7 @@ main()
 
 	# TODO: See above.  Count links.
 	if [ "$(find "${dir}" -type f | wc -l)" -gt 0 ]; then
-		ob_warn "$(ob_get_msg 'files_not_installed')"
+		oh_warn "$(oh_get_msg 'files_not_installed')"
 	fi
 }
 
diff --git a/src/oh-strip.sh b/src/oh-strip.sh
index 1c21545..7b47d6c 100644
--- a/src/oh-strip.sh
+++ b/src/oh-strip.sh
@@ -40,7 +40,7 @@ main()
 				keep_debug='true'
 				;;
 			?)
-				ob_error "$(ob_get_msg 'bad_opt')"
+				oh_error "$(oh_get_msg 'bad_opt')"
 				exit 1
 				;;
 		esac
@@ -78,7 +78,7 @@ strip_so()
 	file="${1}"
 	debug=''
 
-	ob_info "$(ob_get_msg 'strip_so')" "${file}"
+	oh_info "$(oh_get_msg 'strip_so')" "${file}"
 
 	if ${keep_debug}; then
 		debug="$(keep_debug "${file}")"
@@ -97,7 +97,7 @@ strip_exe()
 	file="${1}"
 	debug=''
 
-	ob_info "$(ob_get_msg 'strip_exe')" "${file}"
+	oh_info "$(oh_get_msg 'strip_exe')" "${file}"
 
 	if ${keep_debug}; then
 		debug="$(keep_debug "${file}")"
@@ -115,7 +115,7 @@ strip_a()
 {
 	file="${1}"
 
-	ob_info "$(ob_get_msg 'strip_a')" "${file}"
+	oh_info "$(oh_get_msg 'strip_a')" "${file}"
 
 	${STRIP} --strip-debug "${dir}/${file}"
 }