/[pkgs]/devel/BibTool/BibTool-2.48-regex_DESTDIR.patch
ViewVC logotype

Contents of /devel/BibTool/BibTool-2.48-regex_DESTDIR.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 1.2 - (show annotations) (download) (as text)
Thu Feb 14 20:53:17 2008 UTC (21 months, 1 week ago) by pertusus
Branch: MAIN
CVS Tags: F-12-split, F-10-split, BibTool-2_48-8_fc11, F-11-split, BibTool-2_48-9_fc12, F-9-split, BibTool-2_48-7_fc9, HEAD
Changes since 1.1: +13 -9 lines
File MIME type: text/x-patch 
* Thu Feb 14 2008 Patrice Dumas <pertusus@free.fr> 2.48-7
- add #define __USE_GNU since in regex GNU extensions are used
- keep timestamps and fix man page permissions
1 diff -up BibTool-2.48/rewrite.c.regex_DESTDIR BibTool-2.48/rewrite.c
2 --- BibTool-2.48/rewrite.c.regex_DESTDIR 2004-02-08 10:41:52.000000000 +0100
3 +++ BibTool-2.48/rewrite.c 2008-02-14 21:40:13.000000000 +0100
4 @@ -24,7 +24,8 @@
5 #include <bibtool/rewrite.h>
6
7 #ifdef REGEX
8 -#include <bibtool/regex.h>
9 +#define __USE_GNU
10 +#include <regex.h>
11 #endif
12
13 typedef struct rULE
14 diff -up BibTool-2.48/AutoConf/makefile.in.regex_DESTDIR BibTool-2.48/AutoConf/makefile.in
15 --- BibTool-2.48/AutoConf/makefile.in.regex_DESTDIR 2004-02-08 10:46:11.000000000 +0100
16 +++ BibTool-2.48/AutoConf/makefile.in 2008-02-14 21:43:58.000000000 +0100
17 @@ -208,9 +208,9 @@ NON_ANSI_DEFS = @DEFS@
18 REGEX_DIR = regex-0.12
19 #
20
21 -REGEX_DEF = -DREGEX -I$(REGEX_DIR) -I..
22 +REGEX_DEF = -DREGEX
23
24 -REGEX = regex$(OBJ)
25 +REGEX =
26
27 # -------------------------------------------------------
28 # Kpathsea Library support.
29 @@ -460,8 +460,8 @@ $(OFILES): $(MAKEFILE)
30 # __________________________________________________________________
31 # Targets from the GNU Regular Expression Library.
32
33 -regex$(OBJ): $(REGEX_DIR)$(DIR_SEP)regex.c $(MAKEFILE)
34 - $(CC) $(C_FLAGS) -I$(REGEX_DIR) -I.. $(NON_ANSI_DEFS) $(REGEX_DIR)$(DIR_SEP)regex.c $(DONT_LINK) -o $@
35 +#regex$(OBJ): $(REGEX_DIR)$(DIR_SEP)regex.c $(MAKEFILE)
36 +# $(CC) $(C_FLAGS) -I$(REGEX_DIR) -I.. $(NON_ANSI_DEFS) $(REGEX_DIR)$(DIR_SEP)regex.c $(DONT_LINK) -o $@
37
38
39 bibtcl:
40 @@ -490,7 +490,7 @@ test check:
41 (cd Test; $(MAKE))
42
43 libbib.a: $(OLIBFILES)
44 - $(AR) $@ $(OLIBFILES) regex.o
45 + $(AR) $@ $(OLIBFILES)
46 $(RANLIB) $@
47
48 depend:
49 @@ -499,46 +499,46 @@ depend:
50 install: install.bin install.lib
51
52 install.bin install-exec: bibtool$(EXT)
53 - -$(INSTALL_DIR) $(BINDIR)
54 - $(INSTALL) bibtool$(EXT) $(BINDIR)
55 + -$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
56 + $(INSTALL) bibtool$(EXT) $(DESTDIR)$(BINDIR)
57
58 INSTALL_LIB_FILES = Lib$(DIR_SEP)*.*
59
60 install.lib install-data:
61 - -$(INSTALL_DIR) $(LIBDIR)
62 + -$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
63 for lib in $(INSTALL_LIB_FILES); do \
64 - $(INSTALL_DATA) $$lib $(LIBDIR); \
65 + $(INSTALL_DATA) $$lib $(DESTDIR)$(LIBDIR); \
66 done
67
68 INSTALL_INCLUDE_FILES = $(HFILES)
69
70 install.include install-include:
71 - -$(INSTALL_DIR) $(INCLUDEDIR)
72 + -$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
73 for inc in $(INSTALL_INCLUDE_FILES); do \
74 - $(INSTALL_DATA) $$inc $(INCLUDEDIR); \
75 + $(INSTALL_DATA) $$inc $(DESTDIR)$(INCLUDEDIR); \
76 done
77
78 install.man install-man:
79 - -$(INSTALL_DIR) $(MANDIR)$(DIR_SEP)man$(MANSECT)
80 - $(INSTALL) Doc$(DIR_SEP)bibtool.1 \
81 - $(MANDIR)$(DIR_SEP)man$(MANSECT)$(DIR_SEP)bibtool.$(MANSECT)
82 + -$(INSTALL_DIR) $(DESTDIR)$(MANDIR)$(DIR_SEP)man$(MANSECT)
83 + $(INSTALL_DATA) Doc$(DIR_SEP)bibtool.1 \
84 + $(DESTDIR)$(MANDIR)$(DIR_SEP)man$(MANSECT)$(DIR_SEP)bibtool.$(MANSECT)
85
86 uninstall: uninstall.bin uninstall.lib
87
88 uninstall.bin uninstall-exec:
89 - -$(RM) $(BINDIR)$(DIR_SEP)bibtool$(EXT)
90 + -$(RM) $(DESTDIR)$(BINDIR)$(DIR_SEP)bibtool$(EXT)
91
92 uninstall.lib uninstall-data:
93 - -$(RM) $(LIBDIR)
94 + -$(RM) $(DESTDIR)$(LIBDIR)
95
96 uninstall.include uninstall-include:
97 - -$(RM) $(INCLUDEDIR)
98 + -$(RM) $(DESTDIR)$(INCLUDEDIR)
99
100 uninstall.man uninstall-man:
101 - -$(RM) $(MANDIR)$(DIR_SEP)man$(MANSECT)$(DIR_SEP)bibtool.$(MANSECT)
102 + -$(RM) $(DESTDIR)$(MANDIR)$(DIR_SEP)man$(MANSECT)$(DIR_SEP)bibtool.$(MANSECT)
103
104 status:
105 - @echo $(LIBDIR)
106 + @echo $(DESTDIR)$(LIBDIR)
107
108 # =============================================================================
109 # DO NOT DELETE THIS LINE -- make depend depends on it.
admin@fedoraproject.org
 ViewVC Help
Powered by ViewVC 1.1.2