[PATCH xserver 7/8] xmlrules.in: use $(top_srcdir) rather than ../../../ [...]

[Alan Coopersmith]

Gaetan Nadon wrote:
> Relative paths don't always work in distcheck when srcdir not = builddir
> include $(top_srcdir)/doc/xml/xmlrules.in
> 
> Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
> ---
>  doc/xml/Makefile.am             |    2 +-
>  doc/xml/dtrace/Makefile.am      |    2 +-
>  hw/dmx/doc/Makefile.am          |    2 +-
>  hw/xfree86/doc/sgml/Makefile.am |    2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/doc/xml/Makefile.am b/doc/xml/Makefile.am
> index e66f192..ab3839b 100644
> --- a/doc/xml/Makefile.am
> +++ b/doc/xml/Makefile.am
> @@ -25,7 +25,7 @@ SUBDIRS = dtrace
>  
>  XML_FILES = Xserver-spec.xml
>  
> -include xmlrules.in
> +include $(top_srcdir)/doc/xml/xmlrules.in
>  
>  if ENABLE_DEVEL_DOCS
>  noinst_DATA = $(BUILT_DOC_FILES)
> diff --git a/doc/xml/dtrace/Makefile.am b/doc/xml/dtrace/Makefile.am
> index a95d374..10b4f04 100644
> --- a/doc/xml/dtrace/Makefile.am
> +++ b/doc/xml/dtrace/Makefile.am
> @@ -23,7 +23,7 @@
>  
>  XML_FILES = Xserver-DTrace.xml
>  
> -include ../xmlrules.in
> +include $(top_srcdir)/doc/xml/xmlrules.in
>  
>  if ENABLE_DOCS
>  if XSERVER_DTRACE
> diff --git a/hw/dmx/doc/Makefile.am b/hw/dmx/doc/Makefile.am
> index 58306d2..3b22850 100644
> --- a/hw/dmx/doc/Makefile.am
> +++ b/hw/dmx/doc/Makefile.am
> @@ -21,7 +21,7 @@
>  
>  XML_FILES = dmx.xml scaled.xml
>  
> -include ../../../doc/xml/xmlrules.in
> +include $(top_srcdir)/doc/xml/xmlrules.in
>  
>  if ENABLE_DEVEL_DOCS
>  noinst_DATA = $(BUILT_DOC_FILES)
> diff --git a/hw/xfree86/doc/sgml/Makefile.am b/hw/xfree86/doc/sgml/Makefile.am
> index 5322b42..efed19d 100644
> --- a/hw/xfree86/doc/sgml/Makefile.am
> +++ b/hw/xfree86/doc/sgml/Makefile.am
> @@ -21,7 +21,7 @@
>  
>  XML_FILES = DESIGN.xml
>  
> -include ../../../../doc/xml/xmlrules.in
> +include $(top_srcdir)/doc/xml/xmlrules.in
>  
>  if ENABLE_DEVEL_DOCS
>  noinst_DATA = $(BUILT_DOC_FILES)

Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

-- 
	-Alan Coopersmith-        alan.coopersmith at oracle.com
	 Oracle Solaris Platform Engineering: X Window System