diff options
| author | Gary V. Vaughan <gary@gnu.org> | 2011-11-14 11:44:54 +0700 |
|---|---|---|
| committer | Gary V. Vaughan <gary@gnu.org> | 2011-11-17 17:51:15 +0700 |
| commit | 435cb8d7140c33ffb42d2782f68d47d5833a5015 (patch) | |
| tree | 957bb04564c4408742b70e6821ad5c38e2b1ee78 | |
| parent | e993037093901c25a6eeb599a69c8bba444d3c7d (diff) | |
| download | libtool-435cb8d7140c33ffb42d2782f68d47d5833a5015.tar.gz | |
libtoolize: simplify runtime by substituting pkgauxdir.
* Makefile.am (configure_edit): Substitute pkgauxdir.
* libtoolize.m4sh (func_install_pkgaux_subproject)
(func_install_pkgaux_parent, extract_trace): Use it.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | libtoolize.m4sh | 21 |
2 files changed, 10 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index 3496eafa..ffdcaeb6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -282,6 +282,7 @@ configure_edit = $(SED) \ -e 's,@host_triplet\@,$(host_triplet),g' \ -e 's,@LN_S\@,$(LN_S),g' \ -e 's,@macro_dir\@,$(macro_dir),g' \ + -e 's,@pkgauxdir\@,$(pkgauxdir),g' \ -e 's,@pkgaux_files\@,$(pkgaux_scripts) $(pkgaux_data_files),g' \ -e 's,@pkgaux_install_files\@,$(pkgaux_install_files),g' \ -e 's,@pkgaux_parent_files\@,$(pkgaux_parent_files),g' \ diff --git a/libtoolize.m4sh b/libtoolize.m4sh index f7577050..3e663c37 100644 --- a/libtoolize.m4sh +++ b/libtoolize.m4sh @@ -877,7 +877,7 @@ func_install_pkgaux_subproject () fi for file in $pkgaux_files; do - func_copy "$file" "$pkgdatadir/config" "$ltdl_dir/config" pkgaux_header + func_copy "$file" "$pkgauxdir" "$ltdl_dir/config" pkgaux_header done } @@ -907,15 +907,11 @@ func_install_pkgaux_parent () fi if $opt_install; then - func_config_update config.guess \ - "$pkgdatadir/config" "$aux_dir" pkgaux_header - func_config_update config.sub \ - "$pkgdatadir/config" "$aux_dir" pkgaux_header - func_install_update install-sh \ - "$pkgdatadir/config" "$aux_dir" pkgaux_header + func_config_update config.guess "$pkgauxdir" "$aux_dir" pkgaux_header + func_config_update config.sub "$pkgauxdir" "$aux_dir" pkgaux_header + func_install_update install-sh "$pkgauxdir" "$aux_dir" pkgaux_header fi - func_ltmain_update ltmain.sh \ - "$pkgdatadir/config" "$aux_dir" pkgaux_header + func_ltmain_update ltmain.sh "$pkgauxdir" "$aux_dir" pkgaux_header } @@ -1717,21 +1713,22 @@ func_require_seen_libtool () # Locations for important files: prefix=@prefix@ datadir=@datadir@ - pkgdatadir=@pkgdatadir@ + pkgauxdir=@pkgauxdir@ pkgltdldir=@pkgdatadir@ aclocaldir=@aclocaldir@ # Allow the user to override the master libtoolize repository: if test -n "$_lt_pkgdatadir"; then + pkgauxdir="$_lt_pkgdatadir/libltdl/config" pkgltdldir="$_lt_pkgdatadir/libltdl" pkgdatadir="$_lt_pkgdatadir/libltdl" aclocaldir="$_lt_pkgdatadir/m4" fi + func_nonemptydir_p pkgauxdir func_nonemptydir_p pkgltdldir - func_nonemptydir_p pkgdatadir func_nonemptydir_p aclocaldir - extract_trace=$pkgdatadir/config/extract-trace + extract_trace=$pkgauxdir/extract-trace $require_ltdl_dir case $ltdl_dir in |