Merge lp:~ballogy/activity-log-manager/use-docdir into lp:~activity-log-manager/activity-log-manager/vala

Proposed by Balló György
Status: Merged
Merge reported by: Manish Sinha (मनीष सिन्हा)
Merged at revision: not available
Proposed branch: lp:~ballogy/activity-log-manager/use-docdir
Merge into: lp:~activity-log-manager/activity-log-manager/vala
Diff against target: 25 lines (+2/-2)
2 files modified
Makefile.am (+1/-1)
Makefile.in (+1/-1)
To merge this branch: bzr merge lp:~ballogy/activity-log-manager/use-docdir
Reviewer Review Type Date Requested Status
Activity Log Manager Pending
Review via email: mp+130707@code.launchpad.net

Description of the change

Currently, the documentation is installed into a non-standard "/usr/doc/alm" directory. This change modify it to use to the standard "/usr/share/doc/activity-log-manager" directory instead.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.am'
2--- Makefile.am 2012-01-30 19:39:38 +0000
3+++ Makefile.am 2012-10-21 18:07:25 +0000
4@@ -7,7 +7,7 @@
5 intltool-merge.in \
6 intltool-update.in
7
8-almdocdir = ${prefix}/doc/alm
9+almdocdir = ${docdir}
10 almdoc_DATA = \
11 README\
12 COPYING\
13
14=== modified file 'Makefile.in'
15--- Makefile.in 2012-05-27 20:09:22 +0000
16+++ Makefile.in 2012-10-21 18:07:25 +0000
17@@ -334,7 +334,7 @@
18 intltool-merge.in \
19 intltool-update.in
20
21-almdocdir = ${prefix}/doc/alm
22+almdocdir = ${docdir}
23 almdoc_DATA = \
24 README\
25 COPYING\

Subscribers

People subscribed via source and target branches