aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSense Egbert Hofstede <sense@ubuntu.com>2010-09-21 22:18:22 +0200
committerSense Egbert Hofstede <sense@ubuntu.com>2010-09-21 22:18:22 +0200
commitf8bbae1007b87aee3251afe0e0ee4f9950dadd71 (patch)
tree62522a484d088cada5794c0358a033e727e5ddf6
parente9ed8cb1050236d27ce749ea28fcdd5652ec8e2e (diff)
parent1be18c59d8366b80291977e93f97847ba23eca0e (diff)
downloadlibayatana-appindicator-f8bbae1007b87aee3251afe0e0ee4f9950dadd71.tar.gz
libayatana-appindicator-f8bbae1007b87aee3251afe0e0ee4f9950dadd71.tar.bz2
libayatana-appindicator-f8bbae1007b87aee3251afe0e0ee4f9950dadd71.zip
Resolving conflict when merging with trunk
-rw-r--r--bindings/mono/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am
index c9c038b..dfaa41f 100644
--- a/bindings/mono/Makefile.am
+++ b/bindings/mono/Makefile.am
@@ -18,7 +18,7 @@ DLLPOLICY = $(POLICY).dll
POLICY1 = policy.$(POLICY1_VERSION).$(ASSEMBLY_NAME)
POLICY1_VERSION = 0.1
DLLPOLICY1 = $(POLICY1).dll
-WRAPPER_FREE_BINDING_SRC = ../../src/app-indicator.c
+WRAPPER_FREE_BINDING_SRC = $(top_srcdir)/src/app-indicator.c
WRAPPER_FREE_BINDING = app-indicator.c
TARGET = \
@@ -69,7 +69,7 @@ references = $(GTK_SHARP_LIBS)
test_references = $(GTK_SHARP_LIBS) $(NUNIT_LIBS) -r:$(ASSEMBLY)
$(RAW_API): app-indicator.sources.xml $(WRAPPER_FREE_BINDING)
- $(GAPI_PARSER) app-indicator.sources.xml
+ $(GAPI_PARSER) $(srcdir)/app-indicator.sources.xml
$(WRAPPER_FREE_BINDING): $(WRAPPER_FREE_BINDING_SRC)
sed '/signals\[X_NEW_LABEL\] /,+6d' $(WRAPPER_FREE_BINDING_SRC) > $(WRAPPER_FREE_BINDING)