--- Makefile	2008-12-05 14:36:44.000000000 +0100
+++ Makefile.new	2008-12-05 14:37:21.000000000 +0100
@@ -19,13 +19,7 @@
 CHECKOUT_SCRIPT_MODULE = util
 CHECKOUT_SCRIPT = checkout.sh
 
-LIBDIRS =  cifobj-common-v4.1 \
-           tables-v8.0 \
-           regex-v2.2 \
-           cif-file-v1.0 \
-           misclib-v2.2 \
-           cifparse-obj-v7.0 \
-           $(EXTRACT)
+LIBDIRS =  $(EXTRACT)
 
 all:	compile
 
--- pdb-extract-v3.0/Makefile	2008-12-05 14:42:58.000000000 +0100
+++ pdb-extract-v3.0/Makefile.new	2008-12-05 14:42:15.510315392 +0100
@@ -6,6 +6,7 @@
 
 M_INCL_DIR = ../include
 M_LIB_DIR  = ../lib
+M_LIB_DIR_GENTOO = /usr/GENTOOLIBDIR
 M_BIN_DIR  = ../bin
 
 PROJ_DIR   = .
@@ -37,12 +38,12 @@
 include ../etc/Makefile.platform
 
 # Dependent libraries for the pdbml-parser
-CIF_FILE_LIB      = $(M_LIB_DIR)/cif-file.a
-CIFPARSE_LIB      = $(M_LIB_DIR)/cifparse-obj.a
-CIF_TABLE_LIB     = $(M_LIB_DIR)/cif-table-obj.a
-CIFOBJ_COMMON_LIB = $(M_LIB_DIR)/cifobj-common.a
-REGEX_LIB         = $(M_LIB_DIR)/regex.a
-MISCLIB_LIB       = $(M_LIB_DIR)/misclib.a
+CIF_FILE_LIB      = $(M_LIB_DIR_GENTOO)/cif-file.a
+CIFPARSE_LIB      = $(M_LIB_DIR_GENTOO)/cifparse-obj.a
+CIF_TABLE_LIB     = $(M_LIB_DIR_GENTOO)/tables.a
+CIFOBJ_COMMON_LIB = $(M_LIB_DIR_GENTOO)/common.a
+REGEX_LIB         = $(M_LIB_DIR_GENTOO)/regex.a
+MISCLIB_LIB       = $(M_LIB_DIR_GENTOO)/misclib.a
 
 ALL_DEP_LIBS = $(CIF_FILE_LIB) $(CIFPARSE_LIB) \
   $(CIF_TABLE_LIB) $(CIFOBJ_COMMON_LIB) $(REGEX_LIB) $(MISCLIB_LIB)