--- BibTool-2.48/rewrite.c.regex_DESTDIR	2004-02-08 10:41:52.000000000 +0100
+++ BibTool-2.48/rewrite.c	2007-01-29 17:58:34.000000000 +0100
@@ -24,7 +24,7 @@
 #include <bibtool/rewrite.h>
 
 #ifdef REGEX
-#include <bibtool/regex.h>
+#include <regex.h>
 #endif
 
  typedef struct rULE
--- BibTool-2.48/AutoConf/makefile.in.regex_DESTDIR	2004-02-08 10:46:11.000000000 +0100
+++ BibTool-2.48/AutoConf/makefile.in	2007-01-29 17:58:34.000000000 +0100
@@ -208,9 +208,9 @@
 REGEX_DIR  = regex-0.12
 # 
 
-REGEX_DEF  = -DREGEX -I$(REGEX_DIR) -I..
+REGEX_DEF  = -DREGEX
 
-REGEX      = regex$(OBJ)
+REGEX      =
 
 # -------------------------------------------------------
 #  Kpathsea Library support.
@@ -460,8 +460,8 @@
 # __________________________________________________________________
 #  Targets from the GNU Regular Expression Library.
 
-regex$(OBJ): $(REGEX_DIR)$(DIR_SEP)regex.c $(MAKEFILE)
-	$(CC) $(C_FLAGS) -I$(REGEX_DIR) -I.. $(NON_ANSI_DEFS) $(REGEX_DIR)$(DIR_SEP)regex.c $(DONT_LINK) -o $@
+#regex$(OBJ): $(REGEX_DIR)$(DIR_SEP)regex.c $(MAKEFILE)
+#	$(CC) $(C_FLAGS) -I$(REGEX_DIR) -I.. $(NON_ANSI_DEFS) $(REGEX_DIR)$(DIR_SEP)regex.c $(DONT_LINK) -o $@
 
 
 bibtcl:
@@ -490,7 +490,7 @@
 	(cd Test; $(MAKE))
 
 libbib.a: $(OLIBFILES)
-	$(AR) $@ $(OLIBFILES) regex.o
+	$(AR) $@ $(OLIBFILES)
 	$(RANLIB) $@
 
 depend:
@@ -499,46 +499,46 @@
 install: install.bin install.lib
 
 install.bin install-exec: bibtool$(EXT)
-	-$(INSTALL_DIR) $(BINDIR)
-	$(INSTALL) bibtool$(EXT) $(BINDIR)
+	-$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
+	$(INSTALL) bibtool$(EXT) $(DESTDIR)$(BINDIR)
 
 INSTALL_LIB_FILES = Lib$(DIR_SEP)*.*
 
 install.lib install-data: 
-	-$(INSTALL_DIR) $(LIBDIR)
+	-$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
 	for lib in $(INSTALL_LIB_FILES); do	\
-	  $(INSTALL_DATA) $$lib $(LIBDIR);	\
+	  $(INSTALL_DATA) $$lib $(DESTDIR)$(LIBDIR);	\
 	done
 
 INSTALL_INCLUDE_FILES = $(HFILES)
 
 install.include install-include: 
-	-$(INSTALL_DIR) $(INCLUDEDIR)
+	-$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
 	for inc in $(INSTALL_INCLUDE_FILES); do	\
-	  $(INSTALL_DATA) $$inc $(INCLUDEDIR);	\
+	  $(INSTALL_DATA) $$inc $(DESTDIR)$(INCLUDEDIR);	\
 	done
 
 install.man install-man: 
-	-$(INSTALL_DIR) $(MANDIR)$(DIR_SEP)man$(MANSECT)
+	-$(INSTALL_DIR) $(DESTDIR)$(MANDIR)$(DIR_SEP)man$(MANSECT)
 	$(INSTALL) Doc$(DIR_SEP)bibtool.1 \
-		$(MANDIR)$(DIR_SEP)man$(MANSECT)$(DIR_SEP)bibtool.$(MANSECT)
+		$(DESTDIR)$(MANDIR)$(DIR_SEP)man$(MANSECT)$(DIR_SEP)bibtool.$(MANSECT)
 
 uninstall: uninstall.bin uninstall.lib
 
 uninstall.bin uninstall-exec:
-	-$(RM) $(BINDIR)$(DIR_SEP)bibtool$(EXT)
+	-$(RM) $(DESTDIR)$(BINDIR)$(DIR_SEP)bibtool$(EXT)
 
 uninstall.lib uninstall-data:
-	-$(RM) $(LIBDIR)
+	-$(RM) $(DESTDIR)$(LIBDIR)
 
 uninstall.include uninstall-include:
-	-$(RM) $(INCLUDEDIR)
+	-$(RM) $(DESTDIR)$(INCLUDEDIR)
 
 uninstall.man uninstall-man:
-	-$(RM) $(MANDIR)$(DIR_SEP)man$(MANSECT)$(DIR_SEP)bibtool.$(MANSECT)
+	-$(RM) $(DESTDIR)$(MANDIR)$(DIR_SEP)man$(MANSECT)$(DIR_SEP)bibtool.$(MANSECT)
 
 status:
-	@echo $(LIBDIR)
+	@echo $(DESTDIR)$(LIBDIR)
 
 # =============================================================================
 # DO NOT DELETE THIS LINE -- make depend depends on it.