[meshmagick] Another attempt to fix multilib building.

Bruno Wolff III bruno at fedoraproject.org
Sun Mar 6 18:10:11 UTC 2011


commit 546fea92855773ba76a4e4bdda12cb9c469a2700
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Sun Mar 6 12:09:15 2011 -0600

    Another attempt to fix multilib building.

 meshmagick-multilib.patch |   17 +++++++++++++++--
 meshmagick.spec           |    2 +-
 2 files changed, 16 insertions(+), 3 deletions(-)
---
diff --git a/meshmagick-multilib.patch b/meshmagick-multilib.patch
index ec398f4..395ddfa 100644
--- a/meshmagick-multilib.patch
+++ b/meshmagick-multilib.patch
@@ -1,5 +1,18 @@
---- meshmagick.pc.cmake.orig	2011-02-20 21:57:55.000000000 -0600
-+++ meshmagick.pc.cmake	2011-02-20 22:05:55.000000000 -0600
+--- CMakeLists.txt.orig	2011-03-06 11:59:53.000000000 -0600
++++ CMakeLists.txt	2011-03-06 12:00:27.000000000 -0600
+@@ -117,8 +117,8 @@
+ 
+ install(TARGETS meshmagick_bin meshmagick_lib
+ 	RUNTIME DESTINATION bin
+-	LIBRARY DESTINATION lib
+-	ARCHIVE DESTINATION lib)
++	LIBRARY DESTINATION ${LIB}
++	ARCHIVE DESTINATION ${LIB})
+ 	
+ if(NOT WIN32)
+ 	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/meshmagick.pc
+--- meshmagick.pc.cmake.orig	2011-03-06 12:01:18.000000000 -0600
++++ meshmagick.pc.cmake	2011-03-06 12:01:45.000000000 -0600
 @@ -1,11 +1,11 @@
  prefix=${CMAKE_INSTALL_PREFIX}
  exec_prefix=${CMAKE_INSTALL_PREFIX}
diff --git a/meshmagick.spec b/meshmagick.spec
index 77aafc7..ddaf8ed 100644
--- a/meshmagick.spec
+++ b/meshmagick.spec
@@ -56,7 +56,7 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir}
+make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}.la
 
 


More information about the scm-commits mailing list