Merge lp://staging/~agateau/lightdm-gtk-greeter/fix-missing-greeter-ui into lp://staging/~lightdm-team/lightdm-gtk-greeter/trunk
Proposed by
Aurélien Gâteau
| Status: | Rejected |
|---|---|
| Rejected by: | Robert Ancell |
| Proposed branch: | lp://staging/~agateau/lightdm-gtk-greeter/fix-missing-greeter-ui |
| Merge into: | lp://staging/~lightdm-team/lightdm-gtk-greeter/trunk |
| Diff against target: |
94 lines (+31/-35) 4 files modified
Makefile.am (+31/-1) configure.ac (+0/-2) data/Makefile.am (+0/-14) src/Makefile.am (+0/-18) |
| To merge this branch: | bzr merge lp://staging/~agateau/lightdm-gtk-greeter/fix-missing-greeter-ui |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Robert Ancell | Disapprove | ||
|
Review via email:
|
|||
Description of the change
Make sure code can find greeter.ui (and other files)
It seems variables defined in data/Makefile.am are not available to code in src/Makefile.am. I "fixed" this by moving the content of src/Makefile.am and data/Makefile.am to the toplevel Makefile.am. I'd be happy to update the branch if there is a better way to do this (my autotools skills are a bit rusty)
To post a comment you must log in.
Unmerged revisions
- 8. By Aurélien Gâteau
-
Make sure code can find greeter.ui (and other files)
It seems variables defined in data/Makefile.am are not available to code in
src/Makefile.am. I "fixed" this by moving the content of src/Makefile.am and
data/Makefile.am to the toplevel Makefile.am. I'd be happy to update the branch
if there is a better way to do this (my autotools skills are a bit rusty)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
I've fixed this in master by defining the directory again in src/Makefile.am. That's generally what you do - if you wanted to have it common it would have to be in configure.ac and that has entirely different syntax.
It's autotools. Don't ask too many questions :)