diff options
| author | Ted Gould <ted@gould.cx> | 2010-12-08 14:07:18 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-12-08 14:07:18 -0600 |
| commit | 809366b5730013d53d81fe998510ca71da6f4049 (patch) | |
| tree | b88e665ed502e57d5882128dde3382d61ae30352 /libindicator | |
| parent | e87aa8f4e30f315a8ce8acece383c50e32290481 (diff) | |
| parent | c5c78aad9e7710a18640ea44c2a5af154b2943bc (diff) | |
| download | libayatana-indicator-809366b5730013d53d81fe998510ca71da6f4049.tar.gz libayatana-indicator-809366b5730013d53d81fe998510ca71da6f4049.tar.bz2 libayatana-indicator-809366b5730013d53d81fe998510ca71da6f4049.zip | |
Merging in dual build from Ubuntu Desktop
Diffstat (limited to 'libindicator')
| -rw-r--r-- | libindicator/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am index 39cb2b7..b6239e6 100644 --- a/libindicator/Makefile.am +++ b/libindicator/Makefile.am @@ -73,7 +73,7 @@ glib_marshal_prefix = _indicator_object_marshal indicator-object-enum-types.h: s-enum-types-h @true s-enum-types-h: $(indicator_headers) - ( cd $(srcdir) && $(GLIB_MKENUMS) --template $(srcdir)/indicator-object-enum-types.h.template \ + ( cd $(srcdir) && $(GLIB_MKENUMS) --template $(abs_srcdir)/indicator-object-enum-types.h.template \ $(indicator_headers) ) >> tmp-indicator-object-enum-types.h \ && (cmp -s tmp-indicator-object-enum-types.h indicator-object-enum-types.h || cp tmp-indicator-object-enum-types.h indicator-object-enum-types.h ) \ && rm -f tmp-indicator-object-enum-types.h && echo timestamp > $(@F) @@ -81,7 +81,7 @@ s-enum-types-h: $(indicator_headers) indicator-object-enum-types.c: s-enum-types-c @true s-enum-types-c: $(indicator_headers) - ( cd $(srcdir) && $(GLIB_MKENUMS) --template $(srcdir)/indicator-object-enum-types.c.template \ + ( cd $(srcdir) && $(GLIB_MKENUMS) --template $(abs_srcdir)/indicator-object-enum-types.c.template \ $(indicator_headers) ) > tmp-indicator-object-enum-types.c \ && (cmp -s tmp-indicator-object-enum-types.c indicator-object-enum-types.c || cp tmp-indicator-object-enum-types.c indicator-object-enum-types.c ) \ && rm -f tmp-indicator-object-enum-types.c |