← Back to branch summary

~ubuntu-branches/ubuntu/lucid/erlang/lucid

« back to all changes in this revision

Viewing changes to debian/patches/42man.diff

  • Committer: Bazaar Package Importer
  • Author(s): Luca Falavigna
  • Date: 2008-11-04 22:26:12 UTC
  • mfrom: (3.1.1 lenny)
  • Revision ID: james.westby@ubuntu.com-20081104222612-1uwzavuet6ar35fw
Tags: 1:12.b.3-dfsg-4ubuntu1
* Merge from Debian unstable, remaining Ubuntu changes:
  + debian/patches/glibc2.8_compatibility.patch:
    - Fix FTBFS with new glibc.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/42man.diff
1
 
40man.diff by Francois-Denis Gonthier <neumann@lostwebsite.net>
2
 
 
3
 
Patch allows to use standard man path with erl -man command.
4
 
(Erlang manual pages are placed to /usr/share/man/ hierarchy
5
 
as required by Debian policy.)
6
 
 
7
 
--- erlang-12.b.3-dfsg.orig/erts/etc/common/erlexec.c
8
 
+++ erlang-12.b.3-dfsg/erts/etc/common/erlexec.c
9
 
@@ -658,8 +658,10 @@
10
 
                        error("-man not supported on Windows");
11
 
 #else
12
 
                        argv[i] = "man";
13
 
-                       sprintf(tmpStr, "%s/man", rootdir);
14
 
-                       set_env("MANPATH", tmpStr);
15
 
+                       /*
16
 
+                       * Conform to erlang-manpages content.
17
 
+                       */
18
 
+                       putenv(strsave("MANSECT=3erl:1:4:6"));
19
 
                        execvp("man", argv+i);
20
 
                        error("Could not execute the 'man' command.");
21
 
 #endif