--- Makefile	Tue Mar  8 13:46:23 2005
+++ Makefile	Mon Mar 28 09:22:32 2005
@@ -5,8 +5,15 @@
 #-----------------------------------------------------
 
 all: liblwgeom loaderdumper utils
+ifneq ($(WITH-DOC),)
+	$(MAKE) -C doc chunked-html
+endif
 
 install: all liblwgeom-install loaderdumper-install
+	$(MAKE) INSTALL_DATA="$(INSTALL_DATA)" DATADIR=$(DATADIR) -C utils install
+ifneq ($(WITH-DOC),)
+	$(MAKE) INSTALL_DATA="$(INSTALL_DATA)" DOCSDIR=$(DOCSDIR) -C doc install
+endif
 
 uninstall: liblwgeom-uninstall loaderdumper-uninstall
 
--- Makefile.config	Thu Dec  1 07:26:49 2005
+++ Makefile.config	Fri Dec  9 23:27:18 2005
@@ -75,8 +75,8 @@
 # Use ICONV_LDFLAGS and ICONV_CFLAGS to fine-tune usage.
 #
 USE_ICONV ?= 0
-ICONV_CFLAGS ?=
-ICONV_LDFLAGS ?=
+ICONV_CFLAGS ?=-I/usr/local/include
+ICONV_LDFLAGS ?=-L/usr/local/lib -liconv
 
 #
 # Path to library (to be specified in CREATE FUNCTION queries)