--- lwgeom/Makefile	Wed Jan 26 06:35:56 2005
+++ lwgeom/Makefile	Mon Jan 31 13:28:00 2005
@@ -21,10 +21,10 @@
 SCRIPTS_VERSION=0.1.0
 ifeq (${USE_VERSION},71) 
 	MODULE_FILENAME = $(LPATH)/$(shlib)
-	MODULE_INSTALLDIR = $(libdir)
+	MODULE_INSTALLDIR = $(LIBDIR)
 else
 	MODULE_FILENAME = $(LPATH)/$(shlib)
-	MODULE_INSTALLDIR = $(pkglibdir)
+	MODULE_INSTALLDIR = $(LIBDIR)
 endif
 
 #---------------------------------------------------------------
@@ -123,7 +123,7 @@
 install: all installdirs install-lwgeom-lib install-lwgeom-scripts
 
 install-lwgeom-scripts:
-	$(INSTALL_DATA) lwpostgis.sql $(DESTDIR)$(datadir)
+	$(INSTALL_DATA) lwpostgis.sql $(DESTDIR)$(DATADIR)/lwpostgis.sql.default
 
 #- This has been copied from postgresql and adapted
 install-lwgeom-lib: $(shlib)
@@ -147,10 +147,11 @@
 	sh ../geos_version.sh $(GEOS_DIR) > postgis_geos_version.h
 
 installdirs:
-	$(mkinstalldirs) $(libdir)
+	$(mkinstalldirs) $(LIBDIR)
+	$(mkinstalldirs) $(DATADIR)
 
 uninstall-lwgeom-scripts:
-	rm -f $(DESTDIR)$(datadir)/lwpostgis.sql
+	rm -f $(DESTDIR)$(DATADIR)/lwpostgis.sql
 
 uninstall: uninstall-lib uninstall-lwgeom-scripts