summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/buildsystem.sh2
-rw-r--r--lib/buildsystem/autoconf.sh2
-rw-r--r--lib/load.sh4
-rw-r--r--lib/locale.sh2
-rw-r--r--src/oh-architecture.sh4
-rw-r--r--src/oh-autobuild.sh4
-rw-r--r--src/oh-autoclean.sh4
-rw-r--r--src/oh-autoconfigure.sh4
-rw-r--r--src/oh-autoinstall.sh4
-rw-r--r--src/oh-autotest.sh4
-rw-r--r--src/oh-fixperms.sh4
-rw-r--r--src/oh-installfiles.sh4
-rw-r--r--src/oh-strip.sh4
13 files changed, 23 insertions, 23 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..4443737 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@' = 'true' ]; then
libdir='${prefix}/lib/'"${OPK_HOST_ARCH}"
else
libdir='${prefix}/lib/'
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/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()
{
diff --git a/src/oh-architecture.sh b/src/oh-architecture.sh
index 003b625..9f5593f 100644
--- a/src/oh-architecture.sh
+++ b/src/oh-architecture.sh
@@ -1,4 +1,4 @@
-#!@@SH@@
+#!@SH@
#
# opkhelper
# src/oh-architecture
@@ -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/>.
-. '@@PKGLIBDIR@@/load.sm'
+. '@pkgdatadir@/load.sm'
oh_use buildsystem
diff --git a/src/oh-autobuild.sh b/src/oh-autobuild.sh
index cc365bc..d647afe 100644
--- a/src/oh-autobuild.sh
+++ b/src/oh-autobuild.sh
@@ -1,4 +1,4 @@
-#!@@SH@@
+#!@SH@
#
# opkhelper
# src/oh-autobuild
@@ -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/>.
-. '@@PKGLIBDIR@@/load.sm'
+. '@pkgdatadir@/load.sm'
oh_use buildsystem
diff --git a/src/oh-autoclean.sh b/src/oh-autoclean.sh
index b57b6f1..ad935f0 100644
--- a/src/oh-autoclean.sh
+++ b/src/oh-autoclean.sh
@@ -1,4 +1,4 @@
-#!@@SH@@
+#!@SH@
#
# opkhelper
# src/oh-autoclean
@@ -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/>.
-. '@@PKGLIBDIR@@/load.sm'
+. '@pkgdatadir@/load.sm'
oh_use buildsystem
diff --git a/src/oh-autoconfigure.sh b/src/oh-autoconfigure.sh
index af18b87..af24f3b 100644
--- a/src/oh-autoconfigure.sh
+++ b/src/oh-autoconfigure.sh
@@ -1,4 +1,4 @@
-#!@@SH@@
+#!@SH@
#
# opkhelper
# src/oh-autoconfigure
@@ -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/>.
-. '@@PKGLIBDIR@@/load.sm'
+. '@pkgdatadir@/load.sm'
oh_use buildsystem
diff --git a/src/oh-autoinstall.sh b/src/oh-autoinstall.sh
index 6dbb532..25c1c44 100644
--- a/src/oh-autoinstall.sh
+++ b/src/oh-autoinstall.sh
@@ -1,4 +1,4 @@
-#!@@SH@@
+#!@SH@
#
# opkhelper
# src/oh-autoinstall
@@ -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/>.
-. '@@PKGLIBDIR@@/load.sm'
+. '@pkgdatadir@/load.sm'
oh_use buildsystem
diff --git a/src/oh-autotest.sh b/src/oh-autotest.sh
index f11414d..2061ece 100644
--- a/src/oh-autotest.sh
+++ b/src/oh-autotest.sh
@@ -1,4 +1,4 @@
-#!@@SH@@
+#!@SH@
#
# opkhelper
# src/oh-autotest
@@ -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/>.
-. '@@PKGLIBDIR@@/load.sm'
+. '@pkgdatadir@/load.sm'
oh_use buildsystem
diff --git a/src/oh-fixperms.sh b/src/oh-fixperms.sh
index 71dda4d..b5657a5 100644
--- a/src/oh-fixperms.sh
+++ b/src/oh-fixperms.sh
@@ -1,4 +1,4 @@
-#!@@SH@@
+#!@SH@
#
# opkhelper
# src/oh-fixperms
@@ -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/>.
-. '@@PKGLIBDIR@@/load.sm'
+. '@pkgdatadir@/load.sm'
main()
{
diff --git a/src/oh-installfiles.sh b/src/oh-installfiles.sh
index 5b9926f..4505ac5 100644
--- a/src/oh-installfiles.sh
+++ b/src/oh-installfiles.sh
@@ -1,4 +1,4 @@
-#!@@SH@@
+#!@SH@
#
# opkhelper
# src/oh-installfiles
@@ -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/>.
-. '@@PKGLIBDIR@@/load.sm'
+. '@pkgdatadir@/load.sm'
CR='
'
diff --git a/src/oh-strip.sh b/src/oh-strip.sh
index 4217099..9dbd5f4 100644
--- a/src/oh-strip.sh
+++ b/src/oh-strip.sh
@@ -1,4 +1,4 @@
-#!@@SH@@
+#!@SH@
#
# opkhelper
# src/oh-strip
@@ -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/>.
-. '@@PKGLIBDIR@@/load.sm'
+. '@pkgdatadir@/load.sm'
CR='
'
generated by cgit v0.9.1 at 2024-11-27 13:20:59 (EST)