diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/buildsystem.sh | 2 | ||||
| -rw-r--r-- | lib/buildsystem/autoconf.sh | 2 | ||||
| -rw-r--r-- | lib/buildsystem/local.mk | 2 | ||||
| -rw-r--r-- | lib/load.sh | 4 | ||||
| -rw-r--r-- | lib/local.mk | 2 | ||||
| -rw-r--r-- | lib/locale.sh | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/lib/buildsystem.sh b/lib/buildsystem.sh index ffdba86..0369700 100644 --- a/lib/buildsystem.sh +++ b/lib/buildsystem.sh @@ -155,7 +155,7 @@ oh_buildsystem_arch() fi # Try to find a suitable build system host arch. - for bs_arch in $(cat '@@ARCHTABDIR@@/'"${arch}/${system}") + for bs_arch in $(cat '@archtabdir@/'"${arch}/${system}") do if oh_buildsystem_do 'testarch' "${system}" "${bs_arch}" then diff --git a/lib/buildsystem/autoconf.sh b/lib/buildsystem/autoconf.sh index 7ec8938..716ebca 100644 --- a/lib/buildsystem/autoconf.sh +++ b/lib/buildsystem/autoconf.sh @@ -48,7 +48,7 @@ _oh_autoconf_configure() "${_OH_BUILDSYSTEM_TARGET_ARCH}" 'autoconf')" fi - if [ '@@MULTIARCH_LIBDIR@@' = 'true' ]; then + if [ '@multiarch_libdir@' = 'yes' ]; then libdir='${prefix}/lib/'"${OPK_HOST_ARCH}" else libdir='${prefix}/lib/' diff --git a/lib/buildsystem/local.mk b/lib/buildsystem/local.mk index 76cf972..bacf27d 100644 --- a/lib/buildsystem/local.mk +++ b/lib/buildsystem/local.mk @@ -16,7 +16,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/>. -pkglibbuildsystem_srcs = \ +pkgdatabuildsystem_sources = \ lib/buildsystem/autoconf.sh \ lib/buildsystem/kbuild.sh \ lib/buildsystem/make.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 diff --git a/lib/local.mk b/lib/local.mk index 0f7c62d..53a3ff8 100644 --- a/lib/local.mk +++ b/lib/local.mk @@ -16,7 +16,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/>. -pkglib_srcs = \ +pkgdata_sources = \ lib/load.sh \ lib/common.sh \ lib/output.sh \ diff --git a/lib/locale.sh b/lib/locale.sh index 1ac543b..5601364 100644 --- a/lib/locale.sh +++ b/lib/locale.sh @@ -24,7 +24,7 @@ oh_use output _OH_DEFAULT_LOCALE='en_US' _OH_TEXT_DOMAIN='opkhelper' -_OH_LOCALE_PATH='@@LOCALEDIR@@/%s/LC_MESSAGES/%s.ms' +_OH_LOCALE_PATH='@localedir@/%s/LC_MESSAGES/%s.ms' oh_load_locale() { |