]>
Commit | Line | Data |
---|---|---|
c3b9c785 PG |
1 | --- ./awka/Makefile.in.orig Thu Jun 14 15:35:31 2001 |
2 | +++ ./awka/Makefile.in Thu Jun 14 15:38:47 2001 | |
19bdfa7c | 3 | @@ -14,17 +14,15 @@ |
4 | ||
5 | YACC = @YACC@ | |
6 | AWK = @AWK@ | |
7 | +LDFLAGS = @LDFLAGS@ | |
8 | ||
9 | # where to put awka | |
60d29e1d | 10 | prefix = @prefix@ |
11 | exec_prefix = @exec_prefix@ | |
12 | ||
13 | -BINDIR = @bindir@ | |
14 | -LIBDIR = @libdir@ | |
15 | -INCDIR = @includedir@ | |
16 | -# where to put the man pages | |
17 | -MANDIR = @mandir@ | |
18 | -MANEXT = @MANEXT@ | |
19 | +bindir = @bindir@ | |
20 | +libdir = @libdir@ | |
21 | +includedir = @includedir@ | |
22 | ####################################### | |
23 | ||
24 | MAKEFILEIN = Makefile.in | |
19bdfa7c | 25 | @@ -40,7 +38,7 @@ |
26 | cd ..; /bin/sh ./config.status | |
27 | ||
28 | awka : $(OBJS) | |
29 | - $(CC) $(CFLAGS) $(OBJS) -o awka | |
30 | + $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o awka | |
31 | ||
32 | parse.c : parse.y | |
33 | @echo expect 6 shift/reduce conflicts | |
34 | @@ -51,8 +49,8 @@ | |
60d29e1d | 35 | else mv y.tab.h parse.h ; fi |
36 | ||
37 | install : awka | |
38 | - cp awka$(EXE) $(BINDIR) | |
39 | - chmod a+rx $(BINDIR)/awka$(EXE) | |
40 | + cp awka$(EXE) $(DESTDIR)$(bindir) | |
41 | + chmod a+rx $(DESTDIR)$(bindir)/awka$(EXE) | |
42 | ||
43 | clean : | |
44 | rm -f *.o core awka awka$(EXE) | |
c3b9c785 PG |
45 | --- ./lib/Makefile.in.orig Thu Jun 14 15:42:03 2001 |
46 | +++ ./lib/Makefile.in Thu Jun 14 15:44:48 2001 | |
47 | @@ -18,12 +18,10 @@ | |
60d29e1d | 48 | prefix = @prefix@ |
49 | exec_prefix = @exec_prefix@ | |
50 | ||
51 | -BINDIR = @bindir@ | |
52 | -LIBDIR = @libdir@ | |
53 | -INCDIR = @includedir@ | |
c3b9c785 PG |
54 | +bindir = @bindir@ |
55 | +libdir = @libdir@ | |
56 | +includedir = @includedir@ | |
57 | # where to put the man pages | |
60d29e1d | 58 | -MANDIR = @mandir@ |
59 | -MANEXT = @MANEXT@ | |
c3b9c785 PG |
60 | SHAREDLIB = @SHARED_LIB@ |
61 | VERSION = @VERSION@ | |
62 | BUILDLIB = libawka.a $(SHAREDLIB) | |
63 | @@ -55,11 +53,11 @@ | |
64 | $(AWK) -f ../examples/fixhdr.awk libawka.h.in >libawka.h | |
65 | ||
66 | install : libawka.a $(SHAREDLIB) | |
67 | - cp libawka.a $(LIBDIR) | |
68 | - if [ -f libawka.so ]; then cp libawka.so $(LIBDIR); fi | |
69 | - cp libawka.h $(INCDIR) | |
70 | - chmod a+r $(LIBDIR)/libawka.* | |
71 | - chmod a+r $(INCDIR)/libawka.h | |
72 | + cp libawka.a $(DESTDIR)$(libdir) | |
73 | + if [ -f libawka.so ]; then cp libawka.so $(DESTDIR)$(libdir); fi | |
74 | + cp libawka.h $(DESTDIR)$(includedir) | |
75 | + chmod a+r $(DESTDIR)$(libdir)/libawka.* | |
76 | + chmod a+r $(DESTDIR)$(includedir)/libawka.h | |
77 | ||
78 | clean : | |
79 | rm -f *.o ../regexp/*.o ../regexp/.done core libawka.a libawka.so libawka.h | |
80 | --- ./dfa/Makefile.in.orig Thu Jun 14 15:39:53 2001 | |
81 | +++ ./dfa/Makefile.in Thu Jun 14 15:41:51 2001 | |
82 | @@ -18,12 +18,10 @@ | |
83 | prefix = @prefix@ | |
84 | exec_prefix = @exec_prefix@ | |
85 | ||
86 | -BINDIR = @bindir@ | |
87 | -LIBDIR = @libdir@ | |
88 | -INCDIR = @includedir@ | |
60d29e1d | 89 | +bindir = @bindir@ |
90 | +libdir = @libdir@ | |
91 | +includedir = @includedir@ | |
c3b9c785 PG |
92 | # where to put the man pages |
93 | -MANDIR = @mandir@ | |
94 | -MANEXT = @MANEXT@ | |
60d29e1d | 95 | BUILDLIB = libdfa.@BUILDLIB@ |
96 | ####################################### | |
97 | ||
c3b9c785 | 98 | @@ -46,11 +44,11 @@ |
60d29e1d | 99 | $(CC) -shared $(CFLAGS) $(LOBJS) -o libdfa.so |
100 | ||
101 | install : libdfa.a | |
102 | - cp libdfa.a $(LIBDIR) | |
103 | - if [ -f libdfa.so ]; then cp libdfa.so $(LIBDIR); fi | |
104 | - cp dfa.h $(INCDIR) | |
105 | - chmod a+r $(LIBDIR)/libdfa.* | |
106 | - chmod a+r $(INCDIR)/dfa.h | |
107 | + cp libdfa.a $(DESTDIR)$(libdir) | |
108 | + if [ -f libdfa.so ]; then cp libdfa.so $(DESTDIR)$(libdir); fi | |
109 | + cp dfa.h $(DESTDIR)$(includedir) | |
110 | + chmod a+r $(DESTDIR)$(libdir)/libdfa.* | |
111 | + chmod a+r $(DESTDIR)$(includedir)/dfa.h | |
112 | ||
113 | clean : | |
114 | rm -f *.o core libdfa.a libdfa.so | |
c3b9c785 PG |
115 | --- ./Makefile.in.orig Thu Jun 14 15:25:17 2001 |
116 | +++ ./Makefile.in Thu Jun 14 15:35:12 2001 | |
71e6f2a1 | 117 | @@ -20,13 +20,11 @@ |
60d29e1d | 118 | prefix = @prefix@ |
119 | exec_prefix = @exec_prefix@ | |
120 | ||
121 | -BINDIR = @bindir@ | |
122 | -LIBDIR = @libdir@ | |
123 | -INCDIR = @includedir@ | |
60d29e1d | 124 | +bindir = @bindir@ |
125 | +libdir = @libdir@ | |
126 | +includedir = @includedir@ | |
c3b9c785 | 127 | # where to put the man pages |
71e6f2a1 | 128 | -MANEXT = @MANEXT@ |
129 | -MANSRCDIR = @mandir@ | |
c3b9c785 | 130 | -MANDIR = $(MANSRCDIR)/man$(MANEXT) |
71e6f2a1 | 131 | +mandir = @mandir@ |
c3b9c785 PG |
132 | SHARED_LIB = @SHARED_LIB@ |
133 | BUILDLIB = libawka.a $(SHARED_LIB) | |
60d29e1d | 134 | ####################################### |
c3b9c785 PG |
135 | @@ -47,20 +47,17 @@ |
136 | libdfa: | |
137 | cd dfa; $(MAKE) | |
60d29e1d | 138 | |
c3b9c785 PG |
139 | -AWKAMAN = $(MANDIR)/awka.$(MANEXT) |
140 | install: awka_exe libawka | |
141 | - if [ ! -d $(LIBDIR) ]; then mkdir -p $(LIBDIR); fi | |
142 | - if [ ! -d $(INCDIR) ]; then mkdir -p $(INCDIR); fi | |
143 | - if [ ! -d $(BINDIR) ]; then mkdir -p $(BINDIR); fi | |
144 | - if [ ! -d $(MANDIR) ]; then mkdir -p $(MANDIR); fi | |
145 | - if [ ! -d $(MANSRCDIR)/man5 ]; then mkdir -p $(MANSRCDIR)/man5; fi | |
146 | + mkdir -p $(DESTDIR)$(libdir) | |
147 | + mkdir -p $(DESTDIR)$(includedir) | |
148 | + mkdir -p $(DESTDIR)$(bindir) | |
149 | + mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 | |
150 | cd awka; $(MAKE) install | |
151 | cd lib; $(MAKE) install | |
152 | cd dfa; $(MAKE) install | |
153 | - cp doc/awka.1 $(AWKAMAN) | |
154 | - cp doc/awka-elm.5 $(MANSRCDIR)/man5 | |
155 | - cp doc/awka-elmref.5 $(MANSRCDIR)/man5 | |
156 | - chmod 0644 $(AWKAMAN) | |
157 | + cp doc/awka.1 $(DESTDIR)$(mandir)/man1 | |
158 | + cp doc/awka-elm.5 $(DESTDIR)$(mandir)/man5 | |
71e6f2a1 | 159 | + cp doc/awka-elmref.5 $(DESTDIR)$(mandir)/man5 |
60d29e1d | 160 | |
c3b9c785 PG |
161 | clean: |
162 | cd awka; $(MAKE) clean |