[PATCH] Fix winsup/doc to install into prefix

[PATCH] Fix winsup/doc to install into prefix

[Jon TURNEY]

By default, docdir and htmldir are defined in terms of prefix, so make sure to
define it, so their values are prefix-relative.

Without this, 'make install' installs the documentation into /share/doc/ unless
configured otherwise.

	* Makefile.in (prefix): Define.
---
 winsup/doc/ChangeLog   | 4 ++++
 winsup/doc/Makefile.in | 1 +
 2 files changed, 5 insertions(+)

diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index aefb41e..814e651 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-13  Jon TURNEY  <jon.turney@dronecode.org.uk>
+
+	* Makefile.in (prefix): Define.
+
 2015-03-12  Corinna Vinschen  <corinna@vinschen.de>
 
 	* ntsec.xml (ntsec-mapping-nsswitch-desc): Fix typo.
diff --git a/winsup/doc/Makefile.in b/winsup/doc/Makefile.in
index 55fd850..5b2f0ed 100644
--- a/winsup/doc/Makefile.in
+++ b/winsup/doc/Makefile.in
@@ -12,6 +12,7 @@ SHELL = @SHELL@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
+prefix:=@prefix@
 datarootdir:=@datarootdir@
 docdir = @docdir@
 htmldir = @htmldir@
-- 
2.1.4

Re: [PATCH] Fix winsup/doc to install into prefix

[Corinna Vinschen]

[-- Attachment #1: Type: text/plain, Size: 510 bytes --]

On Mar 13 14:25, Jon TURNEY wrote:
> By default, docdir and htmldir are defined in terms of prefix, so make sure to
> define it, so their values are prefix-relative.
> 
> Without this, 'make install' installs the documentation into /share/doc/ unless
> configured otherwise.
> 
> 	* Makefile.in (prefix): Define.

Please apply.


Thanks,
Corinna

-- 
Corinna Vinschen                  Please, send mails regarding Cygwin to
Cygwin Maintainer                 cygwin AT cygwin DOT com
Red Hat

[-- Attachment #2: Type: application/pgp-signature, Size: 819 bytes --]