evolution-sharp r160 - in trunk: . evolution

[mbarnes svn gnome org]

Author: mbarnes
Date: Sat Feb 23 03:46:27 2008
New Revision: 160
URL: http://svn.gnome.org/viewvc/evolution-sharp?rev=160&view=rev

Log:
2008-02-22  Matthew Barnes  <mbarnes redhat com>

	* Makefile.am:
	* evolution-sharp.pc.in:
	Use $(libdir) instead of $(prefix)/lib for the sake of multilib
	enabled distros.  (#516044)



Modified:
   trunk/ChangeLog
   trunk/evolution-sharp.pc.in
   trunk/evolution/Makefile.am

Modified: trunk/evolution-sharp.pc.in
==============================================================================
--- trunk/evolution-sharp.pc.in	(original)
+++ trunk/evolution-sharp.pc.in	Sat Feb 23 03:46:27 2008
@@ -1,5 +1,5 @@
 prefix= prefix@
-libdir=${prefix}/lib
+libdir= libdir@
 
 Name: Evolution#
 Description: Evolution# - Evolution .NET Binding

Modified: trunk/evolution/Makefile.am
==============================================================================
--- trunk/evolution/Makefile.am	(original)
+++ trunk/evolution/Makefile.am	Sat Feb 23 03:46:27 2008
@@ -79,14 +79,14 @@
 
 install-data-local:
 	@if test -n '$(TARGET)'; then									\
-	  echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(prefix)/lib";		\
-	  $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(prefix)/lib || exit 1;		\
+	  echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir)";		\
+	  $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1;		\
 	fi
 
 uninstall-local:
 	@if test -n '$(TARGET)'; then									\
-	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(prefix)/lib";		\
-	  $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(prefix)/lib || exit 1;	\
+	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir)";		\
+	  $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1;	\
 	fi
 
 evolution-sharp.pub: $(top_srcdir)/evolution-sharp.pub