diff --git a/Makefile b/Makefile
index 6298c5e307d..038b3725760 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: qgis
-# Generated by qmake (1.04a) (Qt 3.1.1) on: Tue Jun 10 19:53:00 2003
+# Generated by qmake (1.06c) (Qt 3.2.0) on: Fri Aug 22 10:17:43 2003
 # Project:  qgis.pro
 # Template: subdirs
 # Command: $(QMAKE) -o Makefile qgis.pro
@@ -9,6 +9,8 @@
 MAKEFILE =	Makefile
 QMAKE    =	qmake
 DEL_FILE =    rm -f
+CHK_DIR_EXISTS= test -d
+MKDIR    = mkdir -p
 SUBTARGETS =	 \
 		sub-src \
 		sub-plugins
@@ -18,16 +20,18 @@ first: all
 all: Makefile $(SUBTARGETS)
 
 src/$(MAKEFILE): 
-	cd src && $(QMAKE)  -o $(MAKEFILE)
+	@$(CHK_DIR_EXISTS) "src" || $(MKDIR) "src"
+	cd src && $(QMAKE) src.pro -o $(MAKEFILE)
 sub-src: src/$(MAKEFILE) FORCE
 	cd src && $(MAKE) -f $(MAKEFILE)
 
 plugins/$(MAKEFILE): 
-	cd plugins && $(QMAKE)  -o $(MAKEFILE)
+	@$(CHK_DIR_EXISTS) "plugins" || $(MKDIR) "plugins"
+	cd plugins && $(QMAKE) plugins.pro -o $(MAKEFILE)
 sub-plugins: plugins/$(MAKEFILE) FORCE
 	cd plugins && $(MAKE) -f $(MAKEFILE)
 
-Makefile: qgis.pro  $(QTDIR)/mkspecs/default/qmake.conf 
+Makefile: qgis.pro  /usr/local/qt-x11-free-3.2.0/mkspecs/default/qmake.conf 
 	$(QMAKE) -o Makefile qgis.pro
 qmake: qmake_all
 	@$(QMAKE) -o Makefile qgis.pro
@@ -36,7 +40,7 @@ all: $(SUBTARGETS)
 qmake_all: src/$(MAKEFILE) plugins/$(MAKEFILE)
 	 ( [ -d src ] && cd src ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
 	 ( [ -d plugins ] && cd plugins ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-clean uninstall install uiclean mocclean lexclean yaccclean: qmake_all FORCE
+clean uninstall uicables mocables install uiclean mocclean lexclean yaccclean: qmake_all FORCE
 	 ( [ -d src ] && cd src ; $(MAKE) -f $(MAKEFILE) $@; ) || true
 	 ( [ -d plugins ] && cd plugins ; $(MAKE) -f $(MAKEFILE) $@; ) || true
 distclean: qmake_all FORCE
diff --git a/src/main.cpp b/src/main.cpp
index c7d655a5446..899f0a88f0f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -14,7 +14,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-
+/* $Id$ */
 #include <qapplication.h>
 #include <qfont.h>
 #include <qstring.h>
diff --git a/src/qgisapp.cpp b/src/qgisapp.cpp
index 2d9a040f8cc..0986f320326 100644
--- a/src/qgisapp.cpp
+++ b/src/qgisapp.cpp
@@ -6,7 +6,7 @@
     email                : sherman at mrcc.com
              Romans 3:23=>Romans 6:23=>Romans 10:9,10=>Romans 12
 ***************************************************************************/
-/* $Id$ */
+
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,6 +15,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
+ /* $Id$ */
 #include <dlfcn.h>
 
 #include <qapplication.h>
@@ -79,7 +80,7 @@ typedef QString name_t();
 typedef QString description_t();
 
 // version
-static const char *qgisVersion = "0.0.12 pre 1 - July 4, 2003";
+static const char *qgisVersion = "0.0.12 pre 2 - August 15, 2003";
 static const int qgisVersionInt = 11;
 // cursors
 static unsigned char zoom_in_bits[] = {
diff --git a/src/qgisapp.h b/src/qgisapp.h
index aebd939398c..ac047295fc9 100644
--- a/src/qgisapp.h
+++ b/src/qgisapp.h
@@ -14,7 +14,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-/*$Id$*/
+/*  $Id$  */
 #ifndef QGISAPP_H
 #define QGISAPP_H
 class QCanvas;
diff --git a/src/qgsattributetable.cpp b/src/qgsattributetable.cpp
index 49174f84560..80600fbffe4 100644
--- a/src/qgsattributetable.cpp
+++ b/src/qgsattributetable.cpp
@@ -15,6 +15,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
+/*  $Id$  */
 #include <qapplication.h>
 #include <qcursor.h>
 #include <qfont.h>
diff --git a/src/qgsattributetable.h b/src/qgsattributetable.h
index 3ef3ddc48dd..90e1d75b053 100644
--- a/src/qgsattributetable.h
+++ b/src/qgsattributetable.h
@@ -15,7 +15,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-
+/*  $Id$  */
 #ifndef QGSATTRIBUTETABLE_H
 #define QGSATTRIBUTETABLE_H
 
diff --git a/src/qgsshapefilelayer.cpp b/src/qgsshapefilelayer.cpp
index 01430ac68df..17a3a76fa89 100644
--- a/src/qgsshapefilelayer.cpp
+++ b/src/qgsshapefilelayer.cpp
@@ -15,6 +15,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
+ /*  $Id$  */
 #include <iostream>
 #include <strstream>
 #include <qapplication.h>
diff --git a/src/qgsshapefilelayer.h b/src/qgsshapefilelayer.h
index d99307d565c..94b460b16bd 100644
--- a/src/qgsshapefilelayer.h
+++ b/src/qgsshapefilelayer.h
@@ -5,7 +5,7 @@
     copyright            : (C) 2002 by Gary E.Sherman
     email                : sherman at mrcc.com
  ***************************************************************************/
-/* $Id$ */
+
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -14,7 +14,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-
+/* $Id$ */
 #ifndef QGSSHAPEFILELAYER_H
 #define QGSSHAPEFILELAYER_H
 class QPainter;
diff --git a/src/src.pro b/src/src.pro
index 3b0f0f8e04e..ccef7808094 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -75,7 +75,21 @@ CONFIG += debug \
           qt \
           thread 
 TARGET = qgis 
-exists ( $(PGSQL)/bin/psql ){
+
+# conditional tests for optional modules
+
+#.............................
+#PostgreSQL support
+#.............................
+contains (DEFINES, postgres){
+ message ("Checking PostgreSQL environment")
+}
+contains ( DEFINES, postgres ){
+MYPGSQL=$$(PGSQL)
+count(MYPGSQL, 1){
+message ("PGSQL environment variable is defined")
+
+
   message ( "Configuring to build with PostgreSQL support" )
   LIBS += -L$(PGSQL)/lib -lpq++
   INCLUDEPATH += $(PGSQL)/include
@@ -90,3 +104,8 @@ exists ( $(PGSQL)/bin/psql ){
   FORMS += qgsdbsourceselectbase.ui \
            qgsnewconnectionbase.ui 
 }
+count(MYPGSQL, 0){
+message ("PGSQL environment variable is not defined. PostgreSQL excluded from build")
+message ("To build with PostgreSQL support set PGSQL to point to your Postgres installation")
+}
+}