Merge lp:~olivier-martin/lightdm/fixed-yelp into lp:lightdm

Proposed by Olivier Martin
Status: Merged
Merged at revision: 2020
Proposed branch: lp:~olivier-martin/lightdm/fixed-yelp
Merge into: lp:lightdm
Diff against target: 18 lines (+8/-0)
1 file modified
autogen.sh (+8/-0)
To merge this branch: bzr merge lp:~olivier-martin/lightdm/fixed-yelp
Reviewer Review Type Date Requested Status
Robert Ancell Approve
Olivier Martin (community) Needs Resubmitting
Review via email: mp+224729@code.launchpad.net

Description of the change

Makefile: Fixed @YELP_HELP_RULES@: *** missing separator

'yelp-tools' are required to build lighthm.
This change checks if yelp-tools are installed prior to configure & build lighthm as recommended on this page:
https://wiki.gnome.org/Initiatives/GnomeGoals/NewDocumentationInfrastructure

To post a comment you must log in.
Revision history for this message
Robert Ancell (robert-ancell) wrote :

"please intall the yelp-tool package"
should read
"please install the yelp-tools package"

Revision history for this message
Robert Ancell (robert-ancell) wrote :

Otherwise looks good, thanks!

2003. By Olivier Martin

Makefile: Fixed @YELP_HELP_RULES@: *** missing separator

'yelp-tools' are required to build lighthm.
This change checks if yelp-tools are installed prior to
configure & build lighthm as recommended on this page:
https://wiki.gnome.org/Initiatives/GnomeGoals/NewDocumentationInfrastructure

Revision history for this message
Olivier Martin (olivier-martin) wrote :

Thanks for the feedback. I have just pushed a new version that fixes this
typo.

On 26 June 2014 23:26, Robert Ancell <email address hidden> wrote:

> Otherwise looks good, thanks!
> --
> https://code.launchpad.net/~olivier-martin/lightdm/fixed-yelp/+merge/224729
> You are the owner of lp:~olivier-martin/lightdm/fixed-yelp.
>

Revision history for this message
Robert Ancell (robert-ancell) wrote :

Still says "intall".

I think you did a push --overwrite? You can just push changes without overwriting.

review: Needs Fixing
2004. By Olivier Martin

autogen.sh: Fixed typo

Revision history for this message
Olivier Martin (olivier-martin) wrote :

Anything missing in this patch?

review: Needs Resubmitting
Revision history for this message
Robert Ancell (robert-ancell) wrote :

Looks good now, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'autogen.sh'
2--- autogen.sh 2013-09-11 17:56:09 +0000
3+++ autogen.sh 2014-06-27 08:42:53 +0000
4@@ -8,6 +8,14 @@
5 autoconf
6 autoheader
7 automake --add-missing --copy --foreign
8+
9+YELP=`which yelp-build`
10+if test -z $YELP; then
11+ echo "*** The tools to build the documentation are not found,"
12+ echo " please install the yelp-tools package ***"
13+ exit 1
14+fi
15+
16 if [ -z "$NOCONFIGURE" ]; then
17 ./configure $@
18 fi

Subscribers

People subscribed via source and target branches