Merge lp://staging/~charlesk/libappindicator/lp-931764 into lp://staging/libappindicator/0.5
Proposed by
Charles Kerr
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Ted Gould | ||||
Approved revision: | 231 | ||||
Merged at revision: | 231 | ||||
Proposed branch: | lp://staging/~charlesk/libappindicator/lp-931764 | ||||
Merge into: | lp://staging/libappindicator/0.5 | ||||
Diff against target: |
243 lines (+86/-85) 7 files modified
bindings/mono/Makefile.am (+3/-3) bindings/mono/app-indicator.sources.xml (+0/-12) bindings/mono/app-indicator.sources.xml.in (+12/-0) bindings/python/Makefile.am (+4/-5) bindings/python/appindicator.override (+0/-65) bindings/python/appindicator.override.in (+65/-0) configure.ac (+2/-0) |
||||
To merge this branch: | bzr merge lp://staging/~charlesk/libappindicator/lp-931764 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ted Gould (community) | Approve | ||
Review via email: mp+96277@code.staging.launchpad.net |
To post a comment you must log in.
Okay well this was a fun ride. In short, the problem is that the mono and python bindings' automake process was not written for cases where the srcdir and builddir are different.
When building the language bindings for mono and python, both have input files that refer to other files in the build by path. These paths break when you change the srcdir, so I've replaced the input files with template files (ie, foo.sources.xml was replaced with foo.sources. xml.in) . That way, input files containing the correct paths can be generated from the templates when the configure script is run.
There were a couple of places in the python and mono directories' Makefile.am files that made similar assumptions about builddir and srcdir. These were also tweaked.