← Back to branch summary

~ubuntu-branches/ubuntu/precise/lmms/precise-updates

« back to all changes in this revision

Viewing changes to debian/patches/lib64-builddir.patch

  • Committer: Bazaar Package Importer
  • Author(s): Артём Попов
  • Date: 2011-02-14 20:58:36 UTC
  • mfrom: (1.1.10 upstream) (3.1.9 sid)
  • Revision ID: james.westby@ubuntu.com-20110214205836-2u41xus1d2mj8nfz
Tags: 0.4.10-1ubuntu1
https://launchpad.net/bugs/718801
* Merge from debian unstable (LP: #718801).  Remaining changes:
  - Replace build-dep on libwine-dev with wine1.2-dev to build
    against the newer Wine.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/lib64-builddir.patch
 
1
diff -Nurwd lmms-0.4.5.orig/cmake/modules/DetectMachine.cmake lmms-0.4.5/cmake/modules/DetectMachine.cmake
 
2
--- lmms-0.4.5.orig/cmake/modules/DetectMachine.cmake   2009-09-11 10:03:20.000000000 +0200
 
3
+++ lmms-0.4.5/cmake/modules/DetectMachine.cmake        2009-09-11 10:05:10.000000000 +0200
 
4
@@ -31,11 +31,7 @@
 
5
 IF(CMAKE_INSTALL_LIBDIR)
 
6
        SET(LIB_DIR "${CMAKE_INSTALL_LIBDIR}")
 
7
 ELSE(CMAKE_INSTALL_LIBDIR)
 
8
-       IF(LMMS_HOST_X86_64)
 
9
-               SET(LIB_DIR lib64)
 
10
-       ELSE(LMMS_HOST_X86_64)
 
11
                SET(LIB_DIR lib)
 
12
-       ENDIF(LMMS_HOST_X86_64)
 
13
 ENDIF(CMAKE_INSTALL_LIBDIR)
 
14
 
 
15