--- qwtconfig.pri.orig
+++ qwtconfig.pri
@@ -7,17 +7,9 @@
 VER_PAT      = 3
 VERSION      = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
 
-unix {
-    INSTALLBASE    = /usr/local/qwt-$$VERSION
-}
-
-win32 {
-    INSTALLBASE    = C:/Qwt-$$VERSION
-}
-
 target.path    = $$INSTALLBASE/lib
-headers.path   = $$INSTALLBASE/include
-doc.path       = $$INSTALLBASE/doc
+headers.path   = $$INSTALLBASE/include/qwt
+doc.path       = $$INSTALLBASE/share/qwt/doc
 
 ######################################################################
 # qmake internal options
@@ -26,7 +18,6 @@
 CONFIG           += qt     # Also for Qtopia Core!
 CONFIG           += warn_on
 CONFIG           += thread
-CONFIG           += silent
 
 ######################################################################
 # release/debug mode
@@ -34,36 +25,14 @@
 # have to differ to avoid, that they overwrite each other.
 ######################################################################
 
-VVERSION = $$[QT_VERSION]
-isEmpty(VVERSION) {
-
-    # Qt 3
-    CONFIG           += release     # release/debug
-}
-else {
-    # Qt 4
-    win32 {
-        # On Windows you can't mix release and debug libraries.
-        # The designer is built in release mode. If you like to use it
-        # you need a release version. For your own application development you
-        # might need a debug version. 
-        # Enable debug_and_release + build_all if you want to build both.
-
-        CONFIG           += release     # release/debug/debug_and_release
-        #CONFIG           += debug_and_release
-        #CONFIG           += build_all
-    }
-    else {
-        CONFIG           += release     # release/debug
-    }
-}
+CONFIG           +=  @ARCHES@ release
 
 ######################################################################
 # If you want to have different names for the debug and release 
 # versions you can add a suffix rule below.
 ######################################################################
 
-DEBUG_SUFFIX        = 
+DEBUG_SUFFIX        = _debug
 RELEASE_SUFFIX      = 
 
 win32 {
@@ -122,4 +91,4 @@
 # Otherwise you have to build them from the examples directory.
 ######################################################################
 
-#CONFIG     += QwtExamples
+CONFIG     += QwtExamples