From cb719e2bf5e659568841f753b4c60261a35786da Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Sat, 15 Jan 2011 09:30:41 +0000 Subject: [PATCH] Fix freebsd compilation --- configure | 6 ++++++ qcm/qt4.qcm | 6 ++++++ src/filesystemwatcher.h | 2 +- src/misc.cpp | 2 +- unixconf.pri | 3 ++- 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/configure b/configure index cd3baa5ef..e5109b66f 100755 --- a/configure +++ b/configure @@ -346,6 +346,12 @@ public: if(!conf->getenv("QC_ENABLE_DEBUG").isEmpty()) { conf->addExtra("CONFIG += debug"); } + #ifdef Q_OS_FREEBSD + conf->addLib("-lexecinfo"); + conf->addExtra("MANPREFIX = \$\$PREFIX"); + #else + conf->addExtra("MANPREFIX = \$\$PREFIX/share"); + #endif return(QT_VERSION >= 0x040500); } }; diff --git a/qcm/qt4.qcm b/qcm/qt4.qcm index 13f9b33d8..0d6998f59 100644 --- a/qcm/qt4.qcm +++ b/qcm/qt4.qcm @@ -21,6 +21,12 @@ public: if(!conf->getenv("QC_ENABLE_DEBUG").isEmpty()) { conf->addExtra("CONFIG += debug"); } + #ifdef Q_OS_FREEBSD + conf->addLib("-lexecinfo"); + conf->addExtra("MANPREFIX = $$PREFIX"); + #else + conf->addExtra("MANPREFIX = $$PREFIX/share"); + #endif return(QT_VERSION >= 0x040500); } }; diff --git a/src/filesystemwatcher.h b/src/filesystemwatcher.h index aeb82c5c4..a16ac0d9b 100644 --- a/src/filesystemwatcher.h +++ b/src/filesystemwatcher.h @@ -12,7 +12,7 @@ #include #include #include -#ifdef Q_WS_MAC +#if defined(Q_WS_MAC) || defined(Q_OS_FREEBSD) #include #include #include diff --git a/src/misc.cpp b/src/misc.cpp index 77b091533..aa77093c6 100644 --- a/src/misc.cpp +++ b/src/misc.cpp @@ -60,7 +60,7 @@ const int UNLEN = 256; #endif #ifndef Q_WS_WIN -#ifdef Q_WS_MAC +#if defined(Q_WS_MAC) || defined(Q_OS_FREEBSD) #include #include #else diff --git a/unixconf.pri b/unixconf.pri index 9c6443828..342e3509f 100644 --- a/unixconf.pri +++ b/unixconf.pri @@ -19,7 +19,8 @@ nox { } else { man.files = ../doc/qbittorrent.1 } -man.path = $$PREFIX/share/man/man1/ + +man.path = $$MANPREFIX/man/man1/ INSTALLS += man # Menu Icon