meshlab/rpath.patch

   1 diff -Nur meshlab.orig/src/meshlab/meshlab.pro meshlab/src/meshlab/meshlab.pro
   2 --- meshlab.orig/src/meshlab/meshlab.pro        2010-05-05 22:54:06.000000000 +1000
   3 +++ meshlab/src/meshlab/meshlab.pro     2010-05-13 19:50:05.837002120 +1000
   4 @@ -108,11 +108,11 @@
   5  #}
   6
   7  linux-g++:LIBS += -L../distrib -lcommon
   8 -linux-g++:QMAKE_RPATHDIR += ../distrib
   9 +linux-g++:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\'
  10  linux-g++-32:LIBS += -L../distrib -lcommon
  11 -linux-g++-32:QMAKE_RPATHDIR += ../distrib
  12 +linux-g++-32:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\'
  13  linux-g++-64:LIBS += -L../distrib -lcommon
  14 -linux-g++-64:QMAKE_RPATHDIR += ../distrib
  15 +linux-g++-64:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\'
  16
  17
  18  # uncomment in your local copy only in emergency cases.
  19 diff -Nur meshlab.orig/src/meshlabserver/meshlabserver.pro meshlab/src/meshlabserver/meshlabserver.pro
  20 --- meshlab.orig/src/meshlabserver/meshlabserver.pro    2010-05-05 22:54:06.000000000 +1000
  21 +++ meshlab/src/meshlabserver/meshlabserver.pro 2010-05-13 19:50:20.230977043 +1000
  22 @@ -22,11 +22,11 @@
  23  win32-msvc2008:  LIBS += -L../distrib -lcommon
  24  win32-g++:  LIBS += -L../distrib -lcommon
  25  linux-g++:  LIBS += -L../distrib -lcommon
  26 -linux-g++:QMAKE_RPATHDIR += ../distrib
  27 +linux-g++:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\'
  28  linux-g++-32:  LIBS += -L../distrib -lcommon
  29 -linux-g++-32:QMAKE_RPATHDIR += ../distrib
  30 +linux-g++-32:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\'
  31  linux-g++-64:  LIBS += -L../distrib -lcommon
  32 -linux-g++-64:QMAKE_RPATHDIR += ../distrib
  33 +linux-g++-64:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\'
  34  #CONFIG (release,debug | release) {
  35  #      win32-msvc2005:release:  LIBS += -L../common/release -lcommon
  36  #      win32-msvc2008:release:  LIBS += -L../common/release -lcommon