[Xfce4-commits] <xfce-utils:xfce-4.8> Don't hardcode the documentation directory (bug #7512).

[Nick Schermer]

Updating branch refs/heads/xfce-4.8
         to 88979104ce88910edc8744dfcf673871c3049c7a (commit)
       from 57120ffd54c19e8360755f67e872f91e09fe991b (commit)

commit 88979104ce88910edc8744dfcf673871c3049c7a
Author: Guido Berhoerster <guido+xfce.org at berhoerster.name>
Date:   Fri Apr 22 10:26:47 2011 +0200

    Don't hardcode the documentation directory (bug #7512).
    
    (cherry picked from commit b5c037013018a0687273811a929b415cb56e703c)

 scripts/Makefile.am |    1 +
 scripts/xfhelp4.in  |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 6ce290c..dcaab46 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -13,6 +13,7 @@ bin_SCRIPTS= \
 edit = sed \
 	-e "s, at _datadir_\@,$(datadir),g" \
 	-e "s, at _libdir_\@,$(libdir),g" \
+	-e "s, at _docdir_\@,$$(dirname $(docdir)),g" \
 	-e "s, at _sysconfdir_\@,$(sysconfdir),g" \
 	-e "s, at BROWSER_DEFAULT\@, at BROWSER_DEFAULT@,g" \
 	-e "s, at TERMINAL_DEFAULT\@, at TERMINAL_DEFAULT@,g"
diff --git a/scripts/xfhelp4.in b/scripts/xfhelp4.in
index 57fe9a0..42d23f8 100644
--- a/scripts/xfhelp4.in
+++ b/scripts/xfhelp4.in
@@ -20,7 +20,7 @@
 #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 
-HELP_DIR="@_datadir_@/doc"
+HELP_DIR="@_docdir_@"
 
 if [ ! x"$1" = x"" ]; then
     MODULE="${1%.html}"