tesing new lib64 patch
This commit is contained in:
parent
b3715e58f6
commit
5117e96e7d
|
@ -1,21 +1,21 @@
|
||||||
diff -ruN qgis-0.8.1-orig/settings.pro qgis-0.8.1/settings.pro
|
diff -ruN qgis-0.8.1-orig/settings.pro qgis-0.8.1/settings.pro
|
||||||
--- qgis-0.8.1-orig/settings.pro 2007-01-01 23:31:27.000000000 -0500
|
--- qgis-0.8.1-orig/settings.pro 2007-01-01 23:31:27.000000000 -0500
|
||||||
+++ qgis-0.8.1/settings.pro 2007-07-05 10:30:08.000000000 -0400
|
+++ qgis-0.8.1/settings.pro 2007-07-05 11:45:38.000000000 -0400
|
||||||
@@ -107,14 +107,14 @@
|
@@ -107,14 +107,14 @@
|
||||||
win32:QGISBINDIR=$${DESTDIR}
|
win32:QGISBINDIR=$${DESTDIR}
|
||||||
macx:QGISBINDIR=$${DESTDIR}/$${QGIS_APP_NAME}.app/Contents/MacOS/
|
macx:QGISBINDIR=$${DESTDIR}/$${QGIS_APP_NAME}.app/Contents/MacOS/
|
||||||
|
|
||||||
-linux-g++:QGISLIBDIR=$${DESTDIR}/lib
|
-linux-g++:QGISLIBDIR=$${DESTDIR}/lib
|
||||||
+linux-g++:QGISLIBDIR=$${DESTDIR}/lib${LIB_SUFFIX}
|
+linux-g++:QGISLIBDIR=$${DESTDIR}/lib$${LIB_SUFFIX}
|
||||||
macx:QGISLIBDIR=$${QGISBINDIR}
|
macx:QGISLIBDIR=$${QGISBINDIR}
|
||||||
win32:QGISLIBDIR=$${DESTDIR}
|
win32:QGISLIBDIR=$${DESTDIR}
|
||||||
|
|
||||||
-QGISPLUGINDIR=$${DESTDIR}/lib/qgis
|
-QGISPLUGINDIR=$${DESTDIR}/lib/qgis
|
||||||
+QGISPLUGINDIR=$${DESTDIR}/lib${LIB_SUFFIX}/qgis
|
+QGISPLUGINDIR=$${DESTDIR}/lib$${LIB_SUFFIX}/qgis
|
||||||
macx:QGISPLUGINDIR=$${DESTDIR}/$${QGIS_APP_NAME}.app/Contents/lib/qgis
|
macx:QGISPLUGINDIR=$${DESTDIR}/$${QGIS_APP_NAME}.app/Contents/lib/qgis
|
||||||
|
|
||||||
-QGISPROVIDERDIR=$${QGISBINDIR}/lib/qgis
|
-QGISPROVIDERDIR=$${QGISBINDIR}/lib/qgis
|
||||||
+QGISPROVIDERDIR=$${QGISBINDIR}/lib${LIB_SUFFIX}/qgis
|
+QGISPROVIDERDIR=$${QGISBINDIR}/lib$${LIB_SUFFIX}/qgis
|
||||||
macx:QGISPROVIDERDIR=$${DESTDIR}/$${QGIS_APP_NAME}.app/Contents/lib/qgis
|
macx:QGISPROVIDERDIR=$${DESTDIR}/$${QGIS_APP_NAME}.app/Contents/lib/qgis
|
||||||
|
|
||||||
win32:QGISDOCDIR=$${DESTDIR}/share/qgis/doc
|
win32:QGISDOCDIR=$${DESTDIR}/share/qgis/doc
|
||||||
|
@ -24,7 +24,7 @@ diff -ruN qgis-0.8.1-orig/settings.pro qgis-0.8.1/settings.pro
|
||||||
win32:LIBS+=-L$${DESTDIR}
|
win32:LIBS+=-L$${DESTDIR}
|
||||||
win32:LIBS+=-L$${DESTDIR}/lib/qgis
|
win32:LIBS+=-L$${DESTDIR}/lib/qgis
|
||||||
-linux-g++:LIBS+=-L$${DESTDIR}/lib
|
-linux-g++:LIBS+=-L$${DESTDIR}/lib
|
||||||
+linux-g++:LIBS+=-L$${DESTDIR}/lib${LIB_SUFFIX}
|
+linux-g++:LIBS+=-L$${DESTDIR}/lib$${LIB_SUFFIX}
|
||||||
linux-g++:LIBS+=-L/usr/lib/ccache/lib
|
linux-g++:LIBS+=-L/usr/lib/ccache/lib
|
||||||
macx:LIBS+=-L$${QGISLIBDIR}
|
macx:LIBS+=-L$${QGISLIBDIR}
|
||||||
macx:LIBS+=-F/Library/Frameworks/
|
macx:LIBS+=-F/Library/Frameworks/
|
||||||
|
|
Reference in New Issue
Block a user