[groff] 01/01: [groff] Make relocation really work.

[Werner LEMBERG]

wl pushed a commit to branch master
in repository groff.

commit f9de108233d08be2dbdb7e2e5e068a0dbbd257fc
Author: Eli Zaretskii <address@hidden>
Date:   Fri May 8 15:14:16 2015 +0200

    [groff] Make relocation really work.
    
    See
    
      https://lists.gnu.org/archive/html/groff/2015-05/msg00000.html
    
    * src/roff/groff/groff.cpp: Include `relocate.h'.
    (main): Use `relocatep'.
---
 ChangeLog                |   19 +++++++++++++++----
 src/roff/groff/groff.cpp |    7 +++++--
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0cafdd0..022f006 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,15 @@
-2015-05-03  Bertrand Garrigues <address@hidden>
+2015-05-08  Eli Zaretskii  <address@hidden>
+
+       [groff] Make relocation really work.
+
+       See
+
+         https://lists.gnu.org/archive/html/groff/2015-05/msg00000.html
+
+       * src/roff/groff/groff.cpp: Include `relocate.h'.
+       (main): Use `relocatep'.
+
+2015-05-03  Bertrand Garrigues  <address@hidden>
 
        Fix Savannah bug #44768 (Solaris 10 compatibility issues).
 
@@ -131,7 +142,7 @@
 
        * tmac/doc-common-u (Dt): Remove invalid leading whitespace.
 
-2015-03-11  Deri James <address@hidden>
+2015-03-11  Deri James  <address@hidden>
 
        * src/devices/gropdf/gropdf.pl: Was not handling the final glyph
        correctly in the "standard" fonts which are not embedded. They
@@ -139,7 +150,7 @@
        remappiing code needs to be applied for them as well as the 
        embedded downloadable fonts.
 
-2015-03-11  Deri James <address@hidden>
+2015-03-11  Deri James  <address@hidden>
 
        * src/devices/gropdf/gropdf.pl: Fix problem remappiing 
        ellipsis (affects all glyphs > 255).
@@ -1700,7 +1711,7 @@ Version 1.22.3 released
        ($(SHPROGDIRS):): Add to existing rule.
        ($(OTHERDIRS):): Depend on $(SHPROGDIRS).
 
-2013-12-08  Eric S. Raymond <address@hidden>
+2013-12-08  Eric S. Raymond  <address@hidden>
 
        Repository fully converted to git.
 
diff --git a/src/roff/groff/groff.cpp b/src/roff/groff/groff.cpp
index cd6e293..b36ceae 100644
--- a/src/roff/groff/groff.cpp
+++ b/src/roff/groff/groff.cpp
@@ -34,6 +34,7 @@ along with this program. If not, see 
<http://www.gnu.org/licenses/>. */
 #include "device.h"
 #include "pipeline.h"
 #include "nonposix.h"
+#include "relocate.h"
 #include "defs.h"
 
 #define GXDITVIEW "gxditview"
@@ -469,8 +470,10 @@ int main(int argc, char **argv)
     f += '=';
     if (binpath && *binpath)
       f += binpath;
-    else
-      f += BINPATH;
+    else {
+      binpath = relocatep(BINPATH);
+      f += binpath;
+    }
     if (path && *path) {
       f += PATH_SEP_CHAR;
       f += path;