[gmime] Install gmime-sharp dll to the correct $(libdir)
- From: Jeffrey Stedfast <fejj src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gmime] Install gmime-sharp dll to the correct $(libdir)
- Date: Thu, 5 Jan 2012 15:57:36 +0000 (UTC)
commit bce1443e321a28835fa6c18ed3d07526dff3c8d8
Author: Jeffrey Stedfast <jeff xamarin com>
Date: Thu Jan 5 10:56:52 2012 -0500
Install gmime-sharp dll to the correct $(libdir)
2012-01-05 Jeffrey Stedfast <fejj gnome org>
Fixes for bug #667072.
* mono/Makefile.am: Install to $(libdir) instead of $(prefix)/libdir.
* mono/gmime-sharp.pc.in: Set libdir to @libdir@
ChangeLog | 8 ++++++++
mono/Makefile.am | 20 ++++++++++----------
mono/gmime-sharp.pc.in | 4 ++--
3 files changed, 20 insertions(+), 12 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 82d48d1..a9abaf6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2012-01-05 Jeffrey Stedfast <fejj gnome org>
+ Fixes for bug #667072.
+
+ * mono/Makefile.am: Install to $(libdir) instead of $(prefix)/libdir.
+
+ * mono/gmime-sharp.pc.in: Set libdir to @libdir@
+
+2012-01-05 Jeffrey Stedfast <fejj gnome org>
+
* src/Makefile.am: Rename uuencode/uudecode to
gmime-uuencode/decode to prevent naming collisions with the GNU
Sharutils tools. Fixes bug #667073.
diff --git a/mono/Makefile.am b/mono/Makefile.am
index c0ef720..6225b4c 100644
--- a/mono/Makefile.am
+++ b/mono/Makefile.am
@@ -83,23 +83,23 @@ $(ASSEMBLY): $(build_sources) generated-stamp $(srcdir)/$(ASSEMBLY_NAME).snk
install-data-hook:
@if test -n '$(TARGET)'; then \
- if test -n '$(DESTDIR)'; then \
- echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /root $(DESTDIR)$(prefix)/lib"; \
- $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /root $(DESTDIR)$(prefix)/lib || exit 1; \
+ if test -n '$(DESTDIR)'; then \
+ echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /root $(DESTDIR)$(libdir)"; \
+ $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /root $(DESTDIR)$(libdir) || exit 1; \
else \
- echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /gacdir $(prefix)/lib"; \
- $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /gacdir $(prefix)/lib || exit 1; \
+ echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /gacdir $(libdir)"; \
+ $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /gacdir $(libdir) || exit 1; \
fi; \
fi
uninstall-local:
@if test -n '$(TARGET)'; then \
- if test -n '$(DESTDIR)'; then \
- echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /root $(DESTDIR)$(prefix)/lib"; \
- $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /root $(DESTDIR)$(prefix)/lib || exit 1; \
+ if test -n '$(DESTDIR)'; then \
+ echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /root $(DESTDIR)$(libdir)"; \
+ $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /root $(DESTDIR)$(libdir) || exit 1; \
else \
- echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /gacdir $(prefix)/lib"; \
- $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /gacdir $(prefix)/lib || exit 1; \
+ echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /gacdir $(libdir)"; \
+ $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /gacdir $(libdir) || exit 1; \
fi; \
fi
diff --git a/mono/gmime-sharp.pc.in b/mono/gmime-sharp.pc.in
index f552678..353a00d 100644
--- a/mono/gmime-sharp.pc.in
+++ b/mono/gmime-sharp.pc.in
@@ -1,5 +1,5 @@
-prefix= prefix@
-libdir=${prefix}/lib
+exec_prefix= prefix@
+libdir= libdir@
Name: gmime-sharp
Version: @VERSION@
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]