Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 configure | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index f8b1d014d7..063de32773 100755
--- a/configure
+++ b/configure
@@ -502,6 +502,7 @@ if test -f "./configure"; then
     pwd_is_source_path="y"
 else
     pwd_is_source_path="n"
+    git_submodule_path_info="(in ${source_path})"
 fi
 
 check_define() {
@@ -3313,7 +3314,7 @@ else
     error_exit "pixman >= 0.21.8 not present. Your options:" \
         "  (1) Preferred: Install the pixman devel package (any recent" \
         "      distro should have packages as Xorg needs pixman too)." \
-        "  (2) Fetch the pixman submodule, using:" \
+        "  (2) Fetch the pixman submodule, using: $git_submodule_path_info" \
         "      git submodule update --init pixman"
   fi
   mkdir -p pixman/pixman
@@ -3593,7 +3594,7 @@ EOF
     # have neither and want - prompt for system/submodule install
     error_exit "DTC (libfdt) version >= 1.4.2 not present. Your options:" \
         "  (1) Preferred: Install the DTC (libfdt) devel package" \
-        "  (2) Fetch the DTC submodule, using:" \
+        "  (2) Fetch the DTC submodule, using: $git_submodule_path_info" \
         "      git submodule update --init dtc"
   else
     # don't have and don't want
-- 
2.13.3

On 07/26/2017 04:40 PM, Philippe Mathieu-Daudé wrote:

In the subject: s/remember/remind/

> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  configure | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/configure b/configure
> index f8b1d014d7..063de32773 100755
> --- a/configure
> +++ b/configure
> @@ -502,6 +502,7 @@ if test -f "./configure"; then
>      pwd_is_source_path="y"
>  else
>      pwd_is_source_path="n"
> +    git_submodule_path_info="(in ${source_path})"
>  fi
>  
>  check_define() {
> @@ -3313,7 +3314,7 @@ else
>      error_exit "pixman >= 0.21.8 not present. Your options:" \
>          "  (1) Preferred: Install the pixman devel package (any recent" \
>          "      distro should have packages as Xorg needs pixman too)." \
> -        "  (2) Fetch the pixman submodule, using:" \
> +        "  (2) Fetch the pixman submodule, using: $git_submodule_path_info" \
>          "      git submodule update --init pixman"

Pre-patch (or in-tree build), we're merely giving the user something
they can directly paste into their terminal.  But "(in /path/to/xyz)" is
not directly useful.  Can we spell it:

(2) Fetch the pixman submodule, using:
    ( cd $source_path &&
      git submodule update --init pixman
    )

for even easier copy-and-paste on the user's part?

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org

On 07/26/2017 06:51 PM, Eric Blake wrote:
> On 07/26/2017 04:40 PM, Philippe Mathieu-Daudé wrote:
> 
> In the subject: s/remember/remind/
> 
>> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>> ---
>>   configure | 5 +++--
>>   1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/configure b/configure
>> index f8b1d014d7..063de32773 100755
>> --- a/configure
>> +++ b/configure
>> @@ -502,6 +502,7 @@ if test -f "./configure"; then
>>       pwd_is_source_path="y"
>>   else
>>       pwd_is_source_path="n"
>> +    git_submodule_path_info="(in ${source_path})"
>>   fi
>>   
>>   check_define() {
>> @@ -3313,7 +3314,7 @@ else
>>       error_exit "pixman >= 0.21.8 not present. Your options:" \
>>           "  (1) Preferred: Install the pixman devel package (any recent" \
>>           "      distro should have packages as Xorg needs pixman too)." \
>> -        "  (2) Fetch the pixman submodule, using:" \
>> +        "  (2) Fetch the pixman submodule, using: $git_submodule_path_info" \
>>           "      git submodule update --init pixman"
> 
> Pre-patch (or in-tree build), we're merely giving the user something
> they can directly paste into their terminal.  But "(in /path/to/xyz)" is
> not directly useful.  Can we spell it:
> 
> (2) Fetch the pixman submodule, using:
>      ( cd $source_path &&
>        git submodule update --init pixman
>      )
> 
> for even easier copy-and-paste on the user's part?

Ok will update and resend for rc1