49 lines
1.5 KiB
Diff
49 lines
1.5 KiB
Diff
|
diff -urNp BibTool.orig/AutoConf/makefile.in BibTool/AutoConf/makefile.in
|
||
|
|
--- BibTool.orig/AutoConf/makefile.in 2011-04-04 18:43:55.000000000 +0200
|
||
|
|
+++ BibTool/AutoConf/makefile.in 2011-04-04 18:57:14.000000000 +0200
|
||
|
|
@@ -220,9 +220,9 @@ NON_ANSI_DEFS = @DEFS@
|
||
|
|
REGEX_DIR = regex-0.12
|
||
|
|
#
|
||
|
|
|
||
|
|
-REGEX_DEF = -DREGEX -I$(REGEX_DIR) -I..
|
||
|
|
+REGEX_DEF = -DREGEX
|
||
|
|
|
||
|
|
-REGEX = regex$(OBJ)
|
||
|
|
+REGEX =
|
||
|
|
|
||
|
|
# -------------------------------------------------------
|
||
|
|
# Kpathsea Library support.
|
||
|
|
@@ -473,8 +473,8 @@ $(OFILES): $(MAKEFILE)
|
||
|
|
# __________________________________________________________________
|
||
|
|
# 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:
|
||
|
|
@@ -503,7 +503,7 @@ test check:
|
||
|
|
(cd Test; $(MAKE))
|
||
|
|
|
||
|
|
libbib.a: $(OLIBFILES)
|
||
|
|
- $(AR) $@ $(OLIBFILES) regex.o
|
||
|
|
+ $(AR) $@ $(OLIBFILES)
|
||
|
|
$(RANLIB) $@
|
||
|
|
|
||
|
|
depend:
|
||
|
|
diff -urNp BibTool.orig/rewrite.c BibTool/rewrite.c
|
||
|
|
--- BibTool.orig/rewrite.c 2010-02-27 12:40:16.000000000 +0100
|
||
|
|
+++ BibTool/rewrite.c 2011-04-04 19:08:00.000000000 +0200
|
||
|
|
@@ -24,7 +24,8 @@
|
||
|
|
#include <bibtool/rewrite.h>
|
||
|
|
|
||
|
|
#ifdef REGEX
|
||
|
|
-#include <bibtool/regex.h>
|
||
|
|
+#define __USE_GNU
|
||
|
|
+#include <regex.h>
|
||
|
|
#endif
|
||
|
|
|
||
|
|
typedef struct rULE
|