Skip to content
Snippets Groups Projects
Commit 4bfa2e32 authored by Jo-Philipp Wich's avatar Jo-Philipp Wich
Browse files

CC: gettext-full: make autopoint and gettextize reloctable


The autopoint and gettextize host utilities contain hardcoded staging dir
paths which need to be overridden for the SDK environment.

Signed-off-by: default avatarJo-Philipp Wich <jow@openwrt.org>

Backport of r48208

git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48211 3c298f89-4303-0410-b956-a3cf2f4a3e73
parent 543b4372
No related branches found
No related tags found
No related merge requests found
......@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gettext-full
PKG_VERSION:=0.19.6
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=gettext-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@GNU/gettext
......
--- a/gettext-tools/misc/autopoint.in
+++ b/gettext-tools/misc/autopoint.in
@@ -27,7 +27,11 @@ archive_version=@ARCHIVE_VERSION@
# Set variables
# - gettext_datadir directory where the data files are stored.
-prefix="@prefix@"
+if [ -n "$STAGING_DIR" ]; then
+ prefix="$STAGING_DIR/../host"
+else
+ prefix="@prefix@"
+fi
datarootdir="@datarootdir@"
: ${gettext_datadir="@datadir@/gettext"}
: ${AUTOM4TE=autom4te}
--- a/gettext-tools/misc/gettextize.in
+++ b/gettext-tools/misc/gettextize.in
@@ -27,7 +27,11 @@ archive_version=@ARCHIVE_VERSION@
# Set variables
# - gettext_datadir directory where the data files are stored.
-prefix="@prefix@"
+if [ -n "$STAGING_DIR" ]; then
+ prefix="$STAGING_DIR/../host"
+else
+ prefix="@prefix@"
+fi
datarootdir="@datarootdir@"
: ${gettext_datadir="@datadir@/gettext"}
: ${AUTOM4TE=autom4te}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment