From b47cee3de3cf298ec395abd50b0bf19ae6b13852 Mon Sep 17 00:00:00 2001
From: gsherman <gsherman@c8812cc2-4d05-0410-92ff-de0c093fc19c>
Date: Wed, 11 Feb 2004 05:47:36 +0000
Subject: [PATCH] changes to build system

git-svn-id: http://svn.osgeo.org/qgis/trunk@791 c8812cc2-4d05-0410-92ff-de0c093fc19c
---
 providers/Makefile.am          | 6 +++++-
 providers/ogr/Makefile.am      | 3 ++-
 providers/postgres/Makefile.am | 7 ++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/providers/Makefile.am b/providers/Makefile.am
index 86b19e4431c..5693a10b201 100644
--- a/providers/Makefile.am
+++ b/providers/Makefile.am
@@ -1 +1,5 @@
-SUBDIRS = ogr postgres
+if HAVE_POSTGRESDB
+POSTGRES = postgres
+endif
+
+SUBDIRS = ogr $(POSTGRES)
diff --git a/providers/ogr/Makefile.am b/providers/ogr/Makefile.am
index 1a9da4beca1..32ed2f416e4 100644
--- a/providers/ogr/Makefile.am
+++ b/providers/ogr/Makefile.am
@@ -1,4 +1,5 @@
-lib_LTLIBRARIES = ogrprovider.la 
+plugindir = ${pkglibdir}
+plugin_LTLIBRARIES = ogrprovider.la 
 
 ogrprovider_la_SOURCES = qgsshapefileprovider.cpp \
                       ../../src/qgsfeature.cpp \
diff --git a/providers/postgres/Makefile.am b/providers/postgres/Makefile.am
index e4437cb910f..df1a3201297 100644
--- a/providers/postgres/Makefile.am
+++ b/providers/postgres/Makefile.am
@@ -1,6 +1,5 @@
-# if PostgreSQL support requested, add PostgreSQL files
-if POSTGRESDB
-lib_LTLIBRARIES     = postgresprovider.la
+plugindir = ${pkglibdir}
+plugin_LTLIBRARIES     = postgresprovider.la
                       
 postgresprovider_la_SOURCES = qgspostgresprovider.cpp \
                       ../../src/qgsfeature.cpp \
@@ -13,5 +12,3 @@ AM_CXXFLAGS := $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PGDB) -I$(PG_INC)
 
 postgresprovider_la_LIBADD = $(QT_LDADD) $(PG_LIB)
 postgresprovider_la_LDFLAGS = -avoid-version -module
-
-endif