Merge lp:~mapreri/inkscape/correct-manpage-path into lp:~inkscape.dev/inkscape/trunk

Proposed by Mattia Rizzolo
Status: Merged
Merged at revision: 15400
Proposed branch: lp:~mapreri/inkscape/correct-manpage-path
Merge into: lp:~inkscape.dev/inkscape/trunk
Diff against target: 26 lines (+4/-1)
1 file modified
CMakeScripts/Pod2man.cmake (+4/-1)
To merge this branch: bzr merge lp:~mapreri/inkscape/correct-manpage-path
Reviewer Review Type Date Requested Status
Inkscape Developers Pending
Review via email: mp+314284@code.launchpad.net

Description of the change

Localized manpages are supposed to be in
    /usr/share/man/$lang/man$section/$name.$section(.gz)
not in
    /usr/share/man/man$section/$name.$lang.$section(.gz)
as inkscape currently installs them.

Then the user can chose the appropriate language by using the -L option of `man`, or by appropriately setting $LC_MESSAGES or $LANG (and the system should already set it).

Apparently inkscape always installed them in that position, dunno why it is doing that, but it's wrong, and causes confusing behavior; using the auto completion of my shell on `man inkscape`:

%<----------------
% man 1 inkscape
completing manual page, section 1
inkscape inkscape.de inkscape.el inkscape.fr inkscape.ja inkscape.sk inkscape.zh_TW
---------------->%

which is unexpected at the very least :)

To post a comment you must log in.
Revision history for this message
Mattia Rizzolo (mapreri) wrote :

Thank you! ♥

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeScripts/Pod2man.cmake'
2--- CMakeScripts/Pod2man.cmake 2016-01-17 21:02:42 +0000
3+++ CMakeScripts/Pod2man.cmake 2017-01-07 20:39:44 +0000
4@@ -28,10 +28,12 @@
5 set(MANPAGE_TARGET "man-${NAME}-${LANG}")
6 set(MANFILE_TEMP "${CMAKE_CURRENT_BINARY_DIR}/man/${NAME}.${LANG}.tmp")
7 set(MANFILE_FULL "${CMAKE_CURRENT_BINARY_DIR}/man/${NAME}.${LANG}.${SECTION}")
8+ set(MANFILE_DEST "${CMAKE_INSTALL_PREFIX}/${SHARE_INSTALL}/man/${LANG}/man${SECTION}")
9 else()
10 set(MANPAGE_TARGET "man-${NAME}")
11 set(MANFILE_TEMP "${CMAKE_CURRENT_BINARY_DIR}/man/${NAME}.tmp")
12 set(MANFILE_FULL "${CMAKE_CURRENT_BINARY_DIR}/man/${NAME}.${SECTION}")
13+ set(MANFILE_DEST "${CMAKE_INSTALL_PREFIX}/${SHARE_INSTALL}/man/man${SECTION}")
14 endif()
15 add_custom_command(
16 OUTPUT ${MANFILE_TEMP}
17@@ -48,7 +50,8 @@
18 )
19 install(
20 FILES ${MANFILE_FULL}
21- DESTINATION ${CMAKE_INSTALL_PREFIX}/${SHARE_INSTALL}/man/man${SECTION}
22+ RENAME ${NAME}.${SECTION}
23+ DESTINATION ${MANFILE_DEST}
24 )
25 endif()
26 endmacro(pod2man PODFILE NAME SECTION CENTER)