diff options
| author | P. J. McDermott <pjm@nac.net> | 2012-04-22 18:56:50 (EDT) |
|---|---|---|
| committer | P. J. McDermott <pjm@nac.net> | 2012-04-22 18:56:50 (EDT) |
| commit | b69fea84f6e73a6d51bd8e3757f6385ed34758cc (patch) | |
| tree | 480a1a6e4fd4f8b168007cd9be2c95094870dd4e | |
| parent | 3e64193f946dcb71dc58b0a4e5f5efcbe2fdf538 (diff) | |
Use new OH_HOST_* variables in oh-copyconfig.
| -rw-r--r-- | src/oh-copyconfig.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/oh-copyconfig.sh b/src/oh-copyconfig.sh index 4bd3871..2f337f8 100644 --- a/src/oh-copyconfig.sh +++ b/src/oh-copyconfig.sh @@ -35,7 +35,7 @@ if [ ! -f ../config ]; then exit 0 fi -if [ -z "${OH_PLATFORM}" ]; then +if [ -z "${OH_HOST_PLATFORM}" ]; then error 'No target platform defined' fi @@ -64,10 +64,10 @@ while read -r type src dest; do # Make sure the destination directory exists. mkdir -p "$(dirname "${full_dest}")" # Find the config package files. - if [ -d "/usr/share/config/${OH_PLATFORM}/${OH_SRCPKG}-${OH_PKGVER}" ]; then - full_src="/usr/share/config/${OH_PLATFORM}/${OH_SRCPKG}-${OH_PKGVER}/${src}" - elif [ -d "/usr/share/config/${OH_PLATFORM}/${OH_SRCPKG}" ]; then - full_src="/usr/share/config/${OH_PLATFORM}/${OH_SRCPKG}/${src}" + if [ -d "/usr/share/config/${OH_HOST_PLATFORM}/${OH_SRCPKG}-${OH_PKGVER}" ]; then + full_src="/usr/share/config/${OH_HOST_PLATFORM}/${OH_SRCPKG}-${OH_PKGVER}/${src}" + elif [ -d "/usr/share/config/${OH_HOST_PLATFORM}/${OH_SRCPKG}" ]; then + full_src="/usr/share/config/${OH_HOST_PLATFORM}/${OH_SRCPKG}/${src}" else # This shouldn't happen unless the package maintainer neglected to add # the config package to the package's Build-Depends field. |