Skip to content

ICU-5628 Fix using install-sh in out-of-source builds #4109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dg0yt wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −12
Open

ICU-5628 Fix using install-sh in out-of-source builds #4109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions icu4c/source/configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4563,6 +4563,9 @@ printf "%s\n" "no" >&6; }
PKG_CONFIG=""
fi
fi
if test -z "$PKG_CONFIG"; then
as_fn_error $? "pkg-config not found" "$LINENO" 5
fi

pkg_failed=no
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for icu-le-hb" >&5
Expand Down Expand Up @@ -4935,12 +4938,12 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'



# make sure install is relative to srcdir - if a script
if test "$srcdir" = "."; then
# If srcdir isn't just ., then (srcdir) is already prepended.
if test "${ac_install_sh}" = "${INSTALL}"; then
INSTALL="\\\$(top_srcdir)/${ac_install_sh}"
fi
# If using the included install-sh, make INSTALL work from any build dir.
if test "${ac_install_sh}" = "${INSTALL}"; then
case "$srcdir" in
.|./*|../*) INSTALL="\\\$(top_builddir)/${ac_install_sh}" ;;
*) ;;
esac
fi

# TODO(ICU-20301): Remove fallback to Python 2.
Expand Down
12 changes: 6 additions & 6 deletions icu4c/source/configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,12 +186,12 @@ AC_PROG_INSTALL

AC_SUBST(cross_compiling)

# make sure install is relative to srcdir - if a script
if test "$srcdir" = "."; then
# If srcdir isn't just ., then (srcdir) is already prepended.
if test "${ac_install_sh}" = "${INSTALL}"; then
INSTALL="\\\$(top_srcdir)/${ac_install_sh}"
fi
# If using the included install-sh, make INSTALL work from any build dir.
if test "${ac_install_sh}" = "${INSTALL}"; then

@dg0yt dg0yt Aug 7, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unchanged guard, and matching an effect in AC_PROG_INSTALL.

case "$srcdir" in
.|./*|../*) INSTALL="\\\$(top_builddir)/${ac_install_sh}" ;;

@dg0yt dg0yt Aug 7, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Guard based on srcdir, similar to original code. I believe srcdir makes sense because it is used to construct the search path - and thus becomes part of the value - for install-sh.
Now any relative path instead of just ., and now prepending top_builddir instead of top_srcdir.

*) ;;
esac
fi

# TODO(ICU-20301): Remove fallback to Python 2.
Expand Down