diff options
| author | Bernd Zeimetz <bernd@bzed.de> | 2010-07-05 11:10:53 +0200 |
|---|---|---|
| committer | Bernd Zeimetz <bernd@bzed.de> | 2010-07-05 11:13:19 +0200 |
| commit | 7793c8c728dc29b9b49a868b15aea5be36e57364 (patch) | |
| tree | 5c0c3cfcd33f5945c589fad410f1cc41436d2e79 /libQgpsmm | |
| parent | 946e8d41d100d447b8239b0cc5571b883bf2a67a (diff) | |
| download | gpsd-7793c8c728dc29b9b49a868b15aea5be36e57364.tar.gz | |
Enhance the libQgpsmm build process.
We now pass libdir and includedir from autotools to qmake to ensure the
library is installed in the same location.
This should avoid an issue on some distributions where 64bit libraries
are living in a different directory. There should be a better way to let
qmake figure this out, but for now this should work.
Diffstat (limited to 'libQgpsmm')
| -rw-r--r-- | libQgpsmm/libQgpsmm.pro | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/libQgpsmm/libQgpsmm.pro b/libQgpsmm/libQgpsmm.pro index 7cd9bf03..13a33fd7 100644 --- a/libQgpsmm/libQgpsmm.pro +++ b/libQgpsmm/libQgpsmm.pro @@ -46,10 +46,32 @@ HEADERS += libQgpsmm_global.h \ isEmpty( PREFIX ) { PREFIX = /usr/local } - target.path = $${PREFIX}/lib + isEmpty( EXEC_PREFIX ) { + EXEC_PREFIX = $${PREFIX} + } + isEmpty( LIBDIR ) { + LIBDIR = /lib + } + isEmpty( INCLUDEDIR ) { + INCLUDEDIR = /include + } + + # TARGET_LIBDIR and TARGET_INCLUDEDIR allow to override + # the library and header install paths. + # This is mainly a workaround as QT was not able to use the proper + # path on some platforms. Both TARGET_ variables will be + # set from the autotools generated Makefile. + # There should be a better way to handle this, though. + isEmpty( TARGET_LIBDIR ) { + TARGET_LIBDIR = $${EXEC_PREFIX}$${LIBDIR} + } + isEmpty( TARGET_INCLUDEDIR ) { + TARGET_INCLUDEDIR = $${PREFIX}$${INCLUDEDIR} + } + target.path = $${TARGET_LIBDIR} INSTALLS += target - header.path = $${PREFIX}/include + header.path = $${TARGET_INCLUDEDIR} header.files = ../libgpsmm.h ../gps.h INSTALLS += header |