diff options
| author | Josh Triplett <josh@freedesktop.org> | 2008-06-01 17:58:02 -0700 |
|---|---|---|
| committer | Josh Triplett <josh@freedesktop.org> | 2008-06-01 17:58:02 -0700 |
| commit | 3f196919cdc01578cafecc4ec551165d8ea8d34a (patch) | |
| tree | d99ed935135a8d2314560e9edb22050fbfec4c1d | |
| parent | fb640ed2c980dcd20edd98a7da2b7a3bc411a888 (diff) | |
Handle subdir-objects correctly.
doltcompile wrote out .lo files with full paths to the objects.
However, .lo files should have relative paths to the objects. This
made compilation fail when using automake's subdir-objects option.
Fix by writing out the correct relative object paths.
Thanks to Alp Toker for testing.
| -rw-r--r-- | dolt.m4 | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -104,7 +104,7 @@ __DOLTCOMPILE__EOF__ if test x$enable_shared = xyes; then cat <<'__DOLTCOMPILE__EOF__' >>doltcompile -echo "pic_object='$pic_object'" +echo "pic_object='.libs/${objbase}.o'" __DOLTCOMPILE__EOF__ else cat <<'__DOLTCOMPILE__EOF__' >>doltcompile @@ -114,7 +114,7 @@ __DOLTCOMPILE__EOF__ if test x$enable_static = xyes; then cat <<'__DOLTCOMPILE__EOF__' >>doltcompile -echo "non_pic_object='$non_pic_object'" +echo "non_pic_object='${objbase}.o'" __DOLTCOMPILE__EOF__ else cat <<'__DOLTCOMPILE__EOF__' >>doltcompile |