blob: c61bd3e61748bc425ef962be4f0690d7dd3569d2 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
|
--- Makefile.in.orig Fri Jan 12 17:24:29 2001
+++ Makefile.in Thu Jan 25 23:41:14 2001
@@ -33,7 +33,7 @@
srcdir= @srcdir@
VPATH= @srcdir@
prefix= @prefix@
-subdirs= @allsubdirs@ regex # doc -- use rfc2229 instead
+subdirs= @allsubdirs@ # regex # doc -- use rfc2229 instead
exec_prefix= @exec_prefix@
man1_prefix= @mandir@/man1
man8_prefix= @mandir@/man8
@@ -57,9 +57,9 @@
-DDICT_CONFIG_PATH=\"$(conf)\"
SCFLAGS= @SCFLAGS@
LDFLAGS= @LDFLAGS@
-XTRACFLAGS= @WCFLAGS@ @XTRACFLAGS@ @DEFS@ @CPPFLAGS@ -I. -Iregex
+XTRACFLAGS= @WCFLAGS@ @XTRACFLAGS@ @DEFS@ @CPPFLAGS@ -I. # -Iregex
XTRALDFLAGS= @WLDFLAGS@ @XTRALDFLAGS@
-LDLIBS= @LIBS@ -Lregex -lregex
+LDLIBS= @LIBS@ -lgnuregex # -Lregex -lregex
EXES= dict dictd dictzip
@@ -75,17 +75,7 @@
all $(EXES)::
@for subdir in `echo $(subdirs)`; do \
echo making in $$subdir; \
- if [ "$$subdir" = "zlib" ]; then \
- (cd $$subdir \
- && $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" libz.a) \
- || exit 1; \
- elif [ "$$subdir" = "regex" ]; then \
- (cd $$subdir \
- && $(MAKE) CC="$(CC) $(CFLAGS)" lib) \
- || exit 1; \
- else \
- (cd $$subdir && $(MAKE)) || exit 1; \
- fi; \
+ (cd $$subdir && $(MAKE)) || exit 1; \
done
all:: $(EXES)
@@ -116,11 +106,13 @@
servscan.o: servscan.c servparse.o servparse.h $(HEADERS)
$(CC) -c $(XTRACFLAGS) $(CFLAGS) $(SCFLAGS) $<
-servparse.c: servparse.y
- $(YACC) -tdv $<
- cmp -s y.tab.h servparse.h || mv y.tab.h servparse.h
- cmp -s y.tab.c servparse.c || mv y.tab.c servparse.c
- -rm -f y.tab.h y.tab.c
+servparse.c: servparse.h
+
+servparse.h: servparse.y
+ $(YACC) -tdv -b serv $<
+ cmp -s serv.tab.h servparse.h || mv serv.tab.h servparse.h
+ cmp -s serv.tab.c servparse.c || mv serv.tab.c servparse.c
+ -rm -f serv.tab.h serv.tab.c
servparse.o: servparse.c $(HEADERS)
$(CC) -c $(XTRACFLAGS) $(CFLAGS) $(SCFLAGS) $<
@@ -145,13 +137,13 @@
install -m 644 dict.1 $(man1_prefix)/dict.1
install.dictzip: dictzip
- install dictzip $(bindir)
- install -m 644 dictzip.1 $(man1_prefix)/dictzip.1
+ ${INSTALL_PROGRAM} dictzip $(bindir)
+ ${INSTALL_DATA} dictzip.1 $(man1_prefix)/dictzip.1
install.dictd: dictd
- install dictd $(sbindir)
+ ${INSTALL_PROGRAM} dictd $(sbindir)
if test ! -d $(man8_prefix); then install -d 755 $(man8_prefix); fi
- install -m 644 dictd.8 $(man8_prefix)/dictd.8
+ ${INSTALL_DATA} dictd.8 $(man8_prefix)/dictd.8
install: $(EXES) install.dict install.dictzip install.dictd
|
