From c0f64171958d491764b961278e0947b7a19d570c Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 18 Jun 2010 10:57:02 -0500
Subject: Readjusting so that the policy file is in the same directory as the
 DLL

---
 bindings/mono/Makefile.am                             |  7 +++++--
 bindings/mono/policy.2.0.appindicator-sharp.config    | 10 ----------
 bindings/mono/policy.2.0.appindicator-sharp.config.in | 10 ++++++++++
 3 files changed, 15 insertions(+), 12 deletions(-)
 delete mode 100644 bindings/mono/policy.2.0.appindicator-sharp.config
 create mode 100644 bindings/mono/policy.2.0.appindicator-sharp.config.in

diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am
index 97b4f26..41eea3f 100644
--- a/bindings/mono/Makefile.am
+++ b/bindings/mono/Makefile.am
@@ -27,7 +27,7 @@ EXTRA_DIST =					\
 	appindicator-sharp.dll.config.in	\
 	app-indicator.sources.xml		\
 	$(ASSEMBLY_NAME).snk			\
-	policy.2.0.$(ASSEMBLY_NAME).config \
+	policy.2.0.$(ASSEMBLY_NAME).config.in \
 	$(customs)				\
 	$(TEST_SOURCES)
 
@@ -86,6 +86,9 @@ $(TEST): $(ASSEMBLY) $(TEST_SOURCES)
 
 all: $(TEST)
 
+policy.2.0.$(ASSEMBLY_NAME).config: policy.2.0.$(ASSEMBLY_NAME).config.in Makefile
+	cp $< $@
+
 $(DLLPOLICY): policy.2.0.$(ASSEMBLY_NAME).config $(ASSEMBLY_NAME).snk Makefile
-	(cd $(srcdir) ; $(AL) -link:policy.2.0.$(ASSEMBLY_NAME).config -out:$(abs_builddir)/$(DLLPOLICY) -keyfile:$(ASSEMBLY_NAME).snk)
+	$(AL) -link:policy.2.0.$(ASSEMBLY_NAME).config -out:$(DLLPOLICY) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk
 
diff --git a/bindings/mono/policy.2.0.appindicator-sharp.config b/bindings/mono/policy.2.0.appindicator-sharp.config
deleted file mode 100644
index dd9e6e9..0000000
--- a/bindings/mono/policy.2.0.appindicator-sharp.config
+++ /dev/null
@@ -1,10 +0,0 @@
-<configuration>
-	<runtime>
-		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-			<dependentAssembly>
-				<assemblyIdentity name="@ASSEMBLY_NAME@" publicKeyToken="bcae265d1c7ab4c2" />
-				<bindingRedirect oldVersion="0.0-@ASSEMBLY_VERSION@" newVersion="@ASSEMBLY_VERSION@"/>
-			</dependentAssembly>
-		</assemblyBinding>
-	</runtime>
-</configuration>
diff --git a/bindings/mono/policy.2.0.appindicator-sharp.config.in b/bindings/mono/policy.2.0.appindicator-sharp.config.in
new file mode 100644
index 0000000..dd9e6e9
--- /dev/null
+++ b/bindings/mono/policy.2.0.appindicator-sharp.config.in
@@ -0,0 +1,10 @@
+<configuration>
+	<runtime>
+		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+			<dependentAssembly>
+				<assemblyIdentity name="@ASSEMBLY_NAME@" publicKeyToken="bcae265d1c7ab4c2" />
+				<bindingRedirect oldVersion="0.0-@ASSEMBLY_VERSION@" newVersion="@ASSEMBLY_VERSION@"/>
+			</dependentAssembly>
+		</assemblyBinding>
+	</runtime>
+</configuration>
-- 
cgit v1.2.3