On 02/09/20 08:09, Mark Cave-Ayland wrote:
> diff --git a/configure b/configure
> index f6638abadf..cb56d31a5d 100755
> --- a/configure
> +++ b/configure
> @@ -1015,6 +1015,9 @@ if test "$mingw32" = "yes" ; then
> prefix="/qemu"
> confsuffix=""
> libs_qga="-lws2_32 -lwinmm -lpowrprof -lwtsapi32 -lwininet -liphlpapi
> -lnetapi32
> $libs_qga"
> + ld_pwd=$(pwd -W)
> +else
> + ld_pwd=$(pwd)
> fi
That wouldn't work for cross-compilation, but I got the idea. :)
> werror=""
> @@ -4290,7 +4293,7 @@ EOF
> symlink "$source_path/dtc/Makefile" "dtc/Makefile"
> fi
> fdt_cflags="-I${source_path}/dtc/libfdt"
> - fdt_ldflags="-L$PWD/dtc/libfdt"
> + fdt_ldflags="-L${ld_pwd}/dtc/libfdt"
> fdt_libs="$fdt_libs"
> elif test "$fdt" = "yes" ; then
> # Not a git build & no libfdt found, prompt for system install
> @@ -5275,7 +5278,7 @@ case "$capstone" in
> else
> LIBCAPSTONE=libcapstone.a
> fi
> - capstone_libs="-L$PWD/capstone -lcapstone"
> + capstone_libs="-L${ld_pwd}/capstone -lcapstone"
> capstone_cflags="-I${source_path}/capstone/include"
> ;;
>
> @@ -6276,7 +6279,7 @@ case "$slirp" in
> fi
> mkdir -p slirp
> slirp_cflags="-I${source_path}/slirp/src -I$PWD/slirp/src"
> - slirp_libs="-L$PWD/slirp -lslirp"
> + slirp_libs="-L${ld_pwd}/slirp -lslirp"
> if test "$mingw32" = "yes" ; then
> slirp_libs="$slirp_libs -lws2_32 -liphlpapi"
> fi
Since there is no recursive make anymore, these can be just
-Ldtc/libfdt, -Lcapstone and -Lslirp. Nice. :)
> I'll try again with the relocatable install later - do I still need to pass
> --prefix
> into configure or should I leave that for now and just use DESTDIR?
You can just use DESTDIR.
Paolo
