CONFIG shouldn't be reset at qmake call, use CONFIG+=… instead

With CONFIG=…, the default values of CONFIG are cleared, with qt4 this
doesn't seem to be a problem, but with qt5 the build fails.

CONFIG=staticlib in openpgpsdk.pro was added in 3caeb0ab7f
for OS X, but is not necessary on linux

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
 ```

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 $@
 
 

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 -
 

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