Index: gsdl/trunk/common-src/src/gdbmedit/db2txt/Makefile.in
===================================================================
--- gsdl/trunk/common-src/src/gdbmedit/db2txt/Makefile.in	(revision 18214)
+++ gsdl/trunk/common-src/src/gdbmedit/db2txt/Makefile.in	(revision 18224)
@@ -1,5 +1,5 @@
 ###########################################################################
 #
-# Makefile -- src/gdbmedit/db2txt
+# Makefile -- common-src/src/gdbmedit/db2txt
 # A component of the Greenstone digital library software
 # from the New Zealand Digital Library Project at the
@@ -27,5 +27,7 @@
 GSDL_DIR = ../../../..
 COMMON_DIR = $(GSDL_DIR)/common-src
-GDBM_DIR = $(COMMON_DIR)/packages/gdbm
+
+COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages
+
 
 CXX = @CXX@
@@ -33,8 +35,8 @@
 DEFS = @DEFS@
 GSDLOS = @gsdlos@
-INCLUDES = -I$(GDBM_DIR)/include -I$(COMMON_DIR)/src/lib
+INCLUDES = -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(COMMON_DIR)/src/lib
 INSTALL = @INSTALL@
 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
-LIBS = @LIBS@ $(GDBM_DIR)/lib/libgdbm.a
+LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a
 
 
Index: gsdl/trunk/common-src/src/gdbmedit/gdbmget/Makefile.in
===================================================================
--- gsdl/trunk/common-src/src/gdbmedit/gdbmget/Makefile.in	(revision 18214)
+++ gsdl/trunk/common-src/src/gdbmedit/gdbmget/Makefile.in	(revision 18224)
@@ -1,5 +1,5 @@
 ###########################################################################
 #
-# Makefile -- src/gdbmedit/gdbmget
+# Makefile -- common-src/src/gdbmedit/gdbmget
 # A component of the Greenstone digital library software
 # from the New Zealand Digital Library Project at the
@@ -27,5 +27,7 @@
 GSDL_DIR = ../../../..
 COMMON_DIR = $(GSDL_DIR)/common-src
-GDBM_DIR = $(COMMON_DIR)/packages/gdbm
+
+COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages
+
 
 CXX = @CXX@
@@ -33,8 +35,8 @@
 DEFS = @DEFS@
 GSDLOS = @gsdlos@
-INCLUDES = -I$(GDBM_DIR)/include -I$(COMMON_DIR)/src/lib
+INCLUDES = -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(COMMON_DIR)/src/lib
 INSTALL = @INSTALL@
 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
-LIBS = @LIBS@ $(GDBM_DIR)/lib/libgdbm.a
+LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a
 
 
Index: gsdl/trunk/common-src/src/gdbmedit/gdbmset/Makefile.in
===================================================================
--- gsdl/trunk/common-src/src/gdbmedit/gdbmset/Makefile.in	(revision 18214)
+++ gsdl/trunk/common-src/src/gdbmedit/gdbmset/Makefile.in	(revision 18224)
@@ -1,5 +1,5 @@
 ###########################################################################
 #
-# Makefile -- src/gdbmedit/gdbmset
+# Makefile -- common-src/src/gdbmedit/gdbmset
 # A component of the Greenstone digital library software
 # from the New Zealand Digital Library Project at the
@@ -27,5 +27,7 @@
 GSDL_DIR = ../../../..
 COMMON_DIR = $(GSDL_DIR)/common-src
-GDBM_DIR = $(COMMON_DIR)/packages/gdbm
+
+COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages
+
 
 CXX = @CXX@
@@ -33,8 +35,8 @@
 DEFS = @DEFS@
 GSDLOS = @gsdlos@
-INCLUDES = -I$(GDBM_DIR)/include -I$(COMMON_DIR)/src/lib
+INCLUDES = -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(COMMON_DIR)/src/lib
 INSTALL = @INSTALL@
 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
-LIBS = @LIBS@ $(GDBM_DIR)/lib/libgdbm.a
+LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a
 
 
Index: gsdl/trunk/common-src/src/gdbmedit/txt2db/Makefile.in
===================================================================
--- gsdl/trunk/common-src/src/gdbmedit/txt2db/Makefile.in	(revision 18214)
+++ gsdl/trunk/common-src/src/gdbmedit/txt2db/Makefile.in	(revision 18224)
@@ -1,5 +1,5 @@
 ###########################################################################
 #
-# Makefile -- src/gdbmedit/txt2db
+# Makefile -- common-src/src/gdbmedit/txt2db
 # A component of the Greenstone digital library software
 # from the New Zealand Digital Library Project at the
@@ -27,5 +27,7 @@
 GSDL_DIR = ../../../..
 COMMON_DIR = $(GSDL_DIR)/common-src
-GDBM_DIR = $(COMMON_DIR)/packages/gdbm
+
+COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages
+
 
 CXX = @CXX@
@@ -33,8 +35,8 @@
 DEFS = @DEFS@
 GSDLOS = @gsdlos@
-INCLUDES = -I$(GDBM_DIR)/include -I$(COMMON_DIR)/src/lib
+INCLUDES = -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(COMMON_DIR)/src/lib
 INSTALL = @INSTALL@
 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
-LIBS = @LIBS@ $(GDBM_DIR)/lib/libgdbm.a
+LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a
 
 
Index: gsdl/trunk/common-src/src/lib/Makefile.in
===================================================================
--- gsdl/trunk/common-src/src/lib/Makefile.in	(revision 18214)
+++ gsdl/trunk/common-src/src/lib/Makefile.in	(revision 18224)
@@ -1,5 +1,5 @@
 ###########################################################################
 #
-# Makefile -- lib
+# Makefile -- common-src/src/lib
 # A component of the Greenstone digital library software
 # from the New Zealand Digital Library Project at the
@@ -25,12 +25,14 @@
 ###########################################################################
 
-GSDL_DIR = ../..
-INDEXERS_DIR = $(GSDL_DIR)/indexers
-PACKAGES_DIR = $(GSDL_DIR)/packages
+GSDL_DIR = ../../..
+COMMON_DIR = $(GSDL_DIR)/common-src
+
+INDEXERS_DIR = $(COMMON_DIR)/indexers
+COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages
 
 
 USE_SQLITE = @USE_SQLITE@
 ifeq ($(USE_SQLITE), 1)
-SQLITE_INCLUDES = -I$(PACKAGES_DIR)/sqlite/include
+SQLITE_INCLUDES = -I$(COMMON_PACKAGES_DIR)/sqlite/include
 SQLITE_OBJECTS = sqlitedbclass.o
 SQLITE_SOURCES = sqlitedbclass.cpp
@@ -46,5 +48,5 @@
 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
 DEFS = @DEFS@
-INCLUDES = @GDBM_INCLUDE@ -I$(GSDL_DIR) -I$(INDEXERS_DIR)/mg/lib $(SQLITE_INCLUDES)
+INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(INDEXERS_DIR)/mg/lib $(SQLITE_INCLUDES)
 RANLIB = @RANLIB@
 
