diff options
| author | Ted Gould <ted@gould.cx> | 2010-06-18 13:01:53 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-06-18 13:01:53 -0500 |
| commit | c012b2a943a86ab70b961a69672c61f4ac6ef3e1 (patch) | |
| tree | 3e8262cfe2fda12edf5cf0f659015153b03b1f80 | |
| parent | f8f18e9f7a1c1ca281fab5c87c2379f8ab59b721 (diff) | |
| download | ayatana-indicator-application-c012b2a943a86ab70b961a69672c61f4ac6ef3e1.tar.gz ayatana-indicator-application-c012b2a943a86ab70b961a69672c61f4ac6ef3e1.tar.bz2 ayatana-indicator-application-c012b2a943a86ab70b961a69672c61f4ac6ef3e1.zip | |
Fixup the gacutil stuff. Still doesn't ununinstall.
| -rw-r--r-- | bindings/mono/Makefile.am | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index b052d86..3fb724f 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -43,7 +43,7 @@ EXTRA_DIST = \ $(customs) \ $(TEST_SOURCES) -GACUTIL_FLAGS="-package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib" +GACUTIL_FLAGS=-package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib references = $(GTK_SHARP_LIBS) test_references = $(GTK_SHARP_LIBS) $(NUNIT_LIBS) -r:$(ASSEMBLY) @@ -86,12 +86,16 @@ $(ASSEMBLY): generated-stamp $(srcdir)/AssemblyInfo.cs $(CSC) $(CSFLAGS) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(builddir)/$(GENERATED_SOURCES) $(srcdir)/AssemblyInfo.cs install-data-local: - echo "$(GACUTIL) -i $(ASSEMBLY_NAME).dll -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib"; \ - $(GACUTIL) -i $(ASSEMBLY_NAME).dll -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib || exit 1; + echo "$(GACUTIL) -i $(ASSEMBLY_NAME).dll $(GACUTIL_FLAGS)"; \ + $(GACUTIL) -i $(ASSEMBLY_NAME).dll $(GACUTIL_FLAGS) || exit 1; + echo "$(GACUTIL) -i $(DLLPOLICY) $(GACUTIL_FLAGS)"; \ + $(GACUTIL) -i $(DLLPOLICY) $(GACUTIL_FLAGS) || exit 1; uninstall-local: - echo "$(GACUTIL) -u $(ASSEMBLY_NAME) -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib"; \ - $(GACUTIL) -u $(ASSEMBLY_NAME) -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib || exit 1; + echo "$(GACUTIL) -u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \ + $(GACUTIL) -u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; + echo "$(GACUTIL) -u $(DLLPOLICY) $(GACUTIL_FLAGS)"; \ + $(GACUTIL) -u $(DLLPOLICY),version=0.0.0.0,Culture=en,PublicKeyToken=bcae265d1c7ab4c2 $(GACUTIL_FLAGS) || exit 1; $(TEST): $(ASSEMBLY) $(TEST_SOURCES) $(CSC) -out:$(TEST) -target:library $(test_references) $(srcdir)/$(TEST_SOURCES) |