diff options
| author | Bruno Haible <bruno@clisp.org> | 2008-12-07 13:41:44 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-06-23 12:15:55 +0200 |
| commit | 99f863368c280ff8a0c3305bf70c37f24904f977 (patch) | |
| tree | 42db5c1b02baf68ce8f1590e0eca2db1e45a34d7 /build-aux | |
| parent | 26278fe9dc80e51ab9d06573ff5a83deaccbf72a (diff) | |
| download | external_gettext-99f863368c280ff8a0c3305bf70c37f24904f977.zip external_gettext-99f863368c280ff8a0c3305bf70c37f24904f977.tar.gz external_gettext-99f863368c280ff8a0c3305bf70c37f24904f977.tar.bz2 | |
Fix installation bug on HP-UX.
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/ltmain.sh | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh index 271873d..0dd6f3a 100644 --- a/build-aux/ltmain.sh +++ b/build-aux/ltmain.sh @@ -1867,6 +1867,7 @@ func_mode_install () # Aesthetically quote it. func_quote_for_eval "$arg" install_prog="$install_prog$func_quote_for_eval_result" + install_shared_prog=$install_prog # We need to accept at least all the BSD install flags. dest= @@ -1876,8 +1877,10 @@ func_mode_install () install_type= isdir=no stripme= + no_mode=: for arg do + arg2= if test -n "$dest"; then files="$files $dest" dest=$arg @@ -1904,6 +1907,10 @@ func_mode_install () *) # If the previous option needed an argument, then skip it. if test -n "$prev"; then + if test "x$prev" = x-m && test -n "$install_override_mode"; then + arg2=$install_override_mode + no_mode=false + fi prev= else dest=$arg @@ -1915,6 +1922,10 @@ func_mode_install () # Aesthetically quote the argument. func_quote_for_eval "$arg" install_prog="$install_prog $func_quote_for_eval_result" + if test -n "$arg2"; then + func_quote_for_eval "$arg2" + fi + install_shared_prog="$install_shared_prog $func_quote_for_eval_result" done test -z "$install_prog" && \ @@ -1923,6 +1934,11 @@ func_mode_install () test -n "$prev" && \ func_fatal_help "the \`$prev' option requires an argument" + if test -n "$install_override_mode" && $no_mode; then + func_quote_for_eval "$install_override_mode" + install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result" + fi + if test -z "$files"; then if test -z "$dest"; then func_fatal_help "no file or destination specified" @@ -2043,7 +2059,7 @@ func_mode_install () test -n "$relink_command" && srcname="$realname"T # Install the shared library and build the symlinks. - func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \ + func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ 'exit $?' tstripme="$stripme" case $host_os in |