From b7f2a6c0a77b20664802b0ac8e724f4450bd5cff Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Wed, 11 Mar 2015 14:06:03 +0000 Subject: [PATCH] Fix winsup/doc to install into prefix 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. Signed-off-by: Jon TURNEY --- 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 aefb41e2b..814e65156 100644 --- a/winsup/doc/ChangeLog +++ b/winsup/doc/ChangeLog @@ -1,3 +1,7 @@ +2015-03-13 Jon TURNEY + + * Makefile.in (prefix): Define. + 2015-03-12 Corinna Vinschen * ntsec.xml (ntsec-mapping-nsswitch-desc): Fix typo. diff --git a/winsup/doc/Makefile.in b/winsup/doc/Makefile.in index b7a8dbd8d..8bf86f703 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@