[PATCH xserver 4/7] hw/xquartz: add missing destdir

[Emil Velikov]

On 1 April 2017 at 07:52, Mihail Konev <k.mvc at ya.ru> wrote:

Here you want to mention what's happening currently and why this is
the correct fix.


> Signed-off-by: Mihail Konev <k.mvc at ya.ru>
> ---
> This allows running "make distcheck" as a non-root.
>
> (Although the resulting DESTDIR includes the path to source tree *twice* ;)
>
>  hw/xquartz/mach-startup/Makefile.am | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/xquartz/mach-startup/Makefile.am b/hw/xquartz/mach-startup/Makefile.am
> index 77962b14d19c..17f0b9d4ddc4 100644
> --- a/hw/xquartz/mach-startup/Makefile.am
> +++ b/hw/xquartz/mach-startup/Makefile.am
> @@ -6,7 +6,7 @@ AM_CPPFLAGS = \
>
>  AM_CFLAGS = $(DIX_CFLAGS)
>
> -x11appdir = $(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/MacOS
> +x11appdir = $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/MacOS

DESTDIR should be used alongside the default APPLE_APPLICATIONS_DIR
within configure.ac. This way you won't need this or any of the other
DESTDIR instances in hw/xquartz/bundle/Makefile.am

-Emil