diff --git a/README.md b/README.md index 617794d77..88d1c5a87 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ Compilation on Linux 3. Compile ```bash cd trunk - qmake CONFIG=debug + qmake CONFIG+=debug make ``` @@ -55,7 +55,7 @@ For packagers ------------- Packagers can use PREFIX and LIB\_DIR to customize the installation paths: ```bash -qmake PREFIX=/usr LIB_DIR=/usr/lib64 +qmake PREFIX=/usr LIB_DIR=/usr/lib64 "CONFIG-=debug" "CONFIG+=release" make make INSTALL_ROOT=${PKGDIR} install ``` diff --git a/build_scripts/Debian+Ubuntu/debian/rules b/build_scripts/Debian+Ubuntu/debian/rules index a0d66eb32..69487e51a 100755 --- a/build_scripts/Debian+Ubuntu/debian/rules +++ b/build_scripts/Debian+Ubuntu/debian/rules @@ -3,7 +3,7 @@ configure: configure-stamp configure-stamp: dh_testdir - cd src && qmake-qt4 CONFIG=release PREFIX=/usr LIB_DIR=/usr/lib RetroShare.pro + cd src && qmake-qt4 "CONFIG-=debug" "CONFIG+=release" PREFIX=/usr LIB_DIR=/usr/lib RetroShare.pro touch $@ diff --git a/build_scripts/RedHat+Fedora/retroshare06.spec b/build_scripts/RedHat+Fedora/retroshare06.spec index bb8339330..d6ef0ff9f 100644 --- a/build_scripts/RedHat+Fedora/retroshare06.spec +++ b/build_scripts/RedHat+Fedora/retroshare06.spec @@ -56,7 +56,7 @@ cd lib/sqlcipher make cd - cd src -qmake-qt4 CONFIG=release PREFIX=%{_prefix} LIB_DIR=%{_libdir} RetroShare.pro +qmake-qt4 "CONFIG-=debug" "CONFIG+=release" PREFIX=%{_prefix} LIB_DIR=%{_libdir} RetroShare.pro make cd - diff --git a/openpgpsdk/src/openpgpsdk.pro b/openpgpsdk/src/openpgpsdk.pro index 786ee5819..f54f5d7f8 100644 --- a/openpgpsdk/src/openpgpsdk.pro +++ b/openpgpsdk/src/openpgpsdk.pro @@ -1,10 +1,10 @@ !include("../../retroshare.pri"): error("Could not include file ../../retroshare.pri") TEMPLATE = lib -win32 { - CONFIG += staticlib -} else { +macx { CONFIG = staticlib +} else { + CONFIG += staticlib } DEFINES *= OPENSSL_NO_IDEA