libubuntuone

Merge lp:~dobey/libubuntuone/python-srcdir into lp:libubuntuone

  1. python-srcdir
  2. Merge into trunk
Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 111
Merged at revision: 111
Proposed branch: lp:~dobey/libubuntuone/python-srcdir
Merge into: lp:libubuntuone
Diff against target: 14 lines (+2/-2)
1 file modified
bindings/python/Makefile.am (+2/-2)
To merge this branch: bzr merge lp:~dobey/libubuntuone/python-srcdir
Reviewer Review Type Date Requested Status
Alejandro J. Cura (community) Approve
Natalia Bidart (community) Approve
Review via email: mp+43830@code.launchpad.net

Commit message

Use $(srcdir)/ prefix for files that are disted in $(srcdir)

Description of the change

This can be tested by doing "(mkdir -p foo && cd foo && ../autogen.sh --enable-debug && make check)" in the branch. With this branch it will succeed. Without these changes, it will fail with the error mentioned in the linked bug report.

To post a comment you must log in.
Revision history for this message
Natalia Bidart (nataliabidart) wrote :

Works!

review: Approve
Revision history for this message
Alejandro J. Cura (alecu) wrote :

Works as advertised.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bindings/python/Makefile.am'
2--- bindings/python/Makefile.am 2010-08-25 18:35:07 +0000
3+++ bindings/python/Makefile.am 2010-12-15 21:03:40 +0000
4@@ -19,8 +19,8 @@
5 --register $(PYGTK_DEFSDIR)/gdk-types.defs \
6 --register $(PYGTK_DEFSDIR)/gtk-types.defs \
7 --prefix gtkwidgets \
8- --override ubuntuone.override \
9- ubuntuone.defs > $@
10+ --override $(srcdir)/ubuntuone.override \
11+ $(srcdir)/ubuntuone.defs > $@
12
13 _gtkwidgets_la_SOURCES = \
14 ubuntuone.c \

Subscribers

People subscribed via source and target branches