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

Nick Schermer noreply at xfce.org
Fri Apr 22 11:20:02 CEST 2011


Updating branch refs/heads/master
         to b5c037013018a0687273811a929b415cb56e703c (commit)
       from a334b1705e645147e0e131b592bbef55eed1badb (commit)

commit b5c037013018a0687273811a929b415cb56e703c
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).

 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}"



More information about the Xfce4-commits mailing list