]>
Commit | Line | Data |
---|---|---|
e918a170 JB |
1 | diff -Nur dump-0.4b32.orig/MCONFIG.in dump-0.4b32/MCONFIG.in |
2 | --- dump-0.4b32.orig/MCONFIG.in Fri Nov 15 11:03:37 2002 | |
3 | +++ dump-0.4b32/MCONFIG.in Mon Nov 18 15:51:55 2002 | |
4 | @@ -1,7 +1,5 @@ | |
5 | VPATH= $(srcdir) | |
6 | ||
7 | -top_builddir= @top_builddir@ | |
8 | - | |
9 | VERSION= 0.4b32 | |
10 | DATE= November 15, 2002 | |
11 | ||
12 | @@ -26,8 +24,8 @@ | |
0734a820 | 13 | |
14 | prefix= @prefix@ | |
15 | exec_prefix= @exec_prefix@ | |
16 | -SBINDIR= @sbindir@ | |
17 | -MANDIR= @mandir@/man8 | |
18 | +sbindir= @sbindir@ | |
caaedc87 | 19 | +mandir= @mandir@ |
20 | ||
21 | DUMPDATESPATH= @DUMPDATESPATH@ | |
22 | # | |
e918a170 JB |
23 | diff -Nur dump-0.4b32.orig/Makefile.in dump-0.4b32/Makefile.in |
24 | --- dump-0.4b32.orig/Makefile.in Tue Nov 2 10:35:55 1999 | |
25 | +++ dump-0.4b32/Makefile.in Mon Nov 18 15:52:06 2002 | |
26 | @@ -1,3 +1,4 @@ | |
27 | +top_builddir= . | |
28 | srcdir= @srcdir@ | |
29 | top_srcdir= @top_srcdir@ | |
30 | ||
31 | @@ -8,7 +9,7 @@ | |
32 | ||
33 | all clean install dep depend realclean distclean:: | |
34 | for i in $(SUBDIRS); do \ | |
35 | - (cd $$i && $(MAKE) $@) || exit 1; \ | |
36 | + (cd $$i && $(MAKE) DESTDIR=$(DESTDIR) $@) || exit 1; \ | |
37 | done | |
38 | ||
39 | distclean:: | |
40 | diff -Nur dump-0.4b32.orig/common/Makefile.in dump-0.4b32/common/Makefile.in | |
41 | --- dump-0.4b32.orig/common/Makefile.in Mon Oct 11 15:31:08 1999 | |
42 | +++ dump-0.4b32/common/Makefile.in Mon Nov 18 15:51:55 2002 | |
43 | @@ -1,5 +1,6 @@ | |
44 | # $Id$ | |
45 | ||
46 | +top_builddir= .. | |
47 | top_srcdir= @top_srcdir@ | |
48 | srcdir= @srcdir@ | |
49 | ||
50 | diff -Nur dump-0.4b32.orig/compat/include/Makefile.in dump-0.4b32/compat/include/Makefile.in | |
51 | --- dump-0.4b32.orig/compat/include/Makefile.in Wed Oct 13 11:57:18 1999 | |
52 | +++ dump-0.4b32/compat/include/Makefile.in Mon Nov 18 15:51:55 2002 | |
53 | @@ -1,5 +1,6 @@ | |
54 | # $Id$ | |
55 | ||
56 | +top_builddir= ../.. | |
57 | top_srcdir= @top_srcdir@ | |
58 | srcdir= @srcdir@ | |
59 | ||
60 | diff -Nur dump-0.4b32.orig/compat/lib/Makefile.in dump-0.4b32/compat/lib/Makefile.in | |
61 | --- dump-0.4b32.orig/compat/lib/Makefile.in Mon Jul 29 14:00:33 2002 | |
62 | +++ dump-0.4b32/compat/lib/Makefile.in Mon Nov 18 15:51:55 2002 | |
63 | @@ -1,5 +1,6 @@ | |
64 | # $Id$ | |
65 | ||
66 | +top_builddir= ../.. | |
67 | top_srcdir= @top_srcdir@ | |
68 | srcdir= @srcdir@ | |
69 | ||
70 | diff -Nur dump-0.4b32.orig/configure.in dump-0.4b32/configure.in | |
71 | --- dump-0.4b32.orig/configure.in Mon Feb 25 14:54:52 2002 | |
72 | +++ dump-0.4b32/configure.in Mon Nov 18 15:51:55 2002 | |
73 | @@ -433,12 +433,6 @@ | |
74 | AC_CHECK_TYPE(u_quad_t, __u64) | |
75 | ||
76 | dnl | |
77 | -dnl Compute top_buildir | |
78 | -dnl | |
79 | -top_builddir=`cd .; pwd` | |
80 | -AC_SUBST(top_builddir) | |
81 | - | |
82 | -dnl | |
83 | dnl Create directories | |
84 | dnl | |
85 | test -d compat || mkdir compat | |
86 | @@ -447,4 +441,5 @@ | |
87 | dnl | |
88 | dnl Output files | |
89 | dnl | |
90 | -AC_OUTPUT(MCONFIG Makefile common/Makefile compat/include/Makefile compat/lib/Makefile dump/Makefile restore/Makefile $RMTMAKEFILE) | |
91 | +AC_CONFIG_FILES([MCONFIG Makefile common/Makefile compat/include/Makefile compat/lib/Makefile dump/Makefile restore/Makefile $RMTMAKEFILE]) | |
92 | +AC_OUTPUT | |
93 | diff -Nur dump-0.4b32.orig/dump/Makefile.in dump-0.4b32/dump/Makefile.in | |
94 | --- dump-0.4b32.orig/dump/Makefile.in Wed Jan 2 11:13:15 2002 | |
95 | +++ dump-0.4b32/dump/Makefile.in Mon Nov 18 15:51:55 2002 | |
96 | @@ -1,5 +1,6 @@ | |
97 | # $Id$ | |
98 | ||
99 | +top_builddir= .. | |
100 | top_srcdir= @top_srcdir@ | |
101 | srcdir= @srcdir@ | |
102 | ||
103 | @@ -12,12 +13,10 @@ | |
caaedc87 | 104 | |
105 | PROG= dump | |
0734a820 | 106 | RPROG= rdump |
107 | -LINKS= ${SBINDIR}/dump ${SBINDIR}/rdump | |
caaedc87 | 108 | SRCS= itime.c main.c optr.c tape.c traverse.c unctime.c |
109 | OBJS= itime.o main.o optr.o tape.o traverse.o unctime.o \ | |
110 | ../common/dumprmt.o | |
111 | -MAN8= dump.8 | |
0734a820 | 112 | -RMAN8= rdump.8 |
caaedc87 | 113 | +MAN8= dump.8 rdump.8 |
114 | ||
0734a820 | 115 | all:: $(PROG) $(MAN8) |
caaedc87 | 116 | |
e918a170 | 117 | @@ -30,11 +29,10 @@ |
caaedc87 | 118 | -e "s|__VERSION__|$(VERSION)|g" $< > $@ |
119 | ||
120 | install:: all | |
0734a820 | 121 | - $(INSTALL) -d $(SBINDIR) $(MANDIR) |
122 | - $(INSTALLBIN) $(PROG) $(SBINDIR) | |
e918a170 | 123 | - $(INSTALLMAN) $(MAN8) $(MANDIR) |
0734a820 | 124 | - cd $(SBINDIR) && $(RM) -f $(RPROG) && $(LN_S) $(PROG) $(RPROG) |
125 | - cd $(MANDIR) && $(RM) -f $(RMAN8) && $(LN_S) $(MAN8) $(RMAN8) | |
caaedc87 | 126 | + $(INSTALL) -d $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir)/man8 |
127 | + $(INSTALLBIN) $(PROG) $(DESTDIR)$(sbindir) | |
128 | + $(LN_S) dump $(DESTDIR)$(sbindir)/rdump | |
129 | + $(INSTALLMAN) $(MAN8) $(DESTDIR)$(mandir)/man8 | |
130 | ||
131 | clean:: | |
0734a820 | 132 | $(RM) -f $(PROG) $(MAN8) \#* *.s *.o *.a *~ core |
e918a170 JB |
133 | diff -Nur dump-0.4b32.orig/dump/rdump.8 dump-0.4b32/dump/rdump.8 |
134 | --- dump-0.4b32.orig/dump/rdump.8 Thu Jan 1 01:00:00 1970 | |
135 | +++ dump-0.4b32/dump/rdump.8 Mon Nov 18 15:51:55 2002 | |
caaedc87 | 136 | @@ -0,0 +1 @@ |
137 | +.so dump.8 | |
e918a170 JB |
138 | diff -Nur dump-0.4b32.orig/restore/Makefile.in dump-0.4b32/restore/Makefile.in |
139 | --- dump-0.4b32.orig/restore/Makefile.in Wed Jan 2 11:13:16 2002 | |
140 | +++ dump-0.4b32/restore/Makefile.in Mon Nov 18 15:51:55 2002 | |
141 | @@ -1,7 +1,10 @@ | |
142 | # $Id$ | |
0734a820 | 143 | |
e918a170 | 144 | +top_builddir= .. |
0734a820 | 145 | top_srcdir= @top_srcdir@ |
146 | srcdir= @srcdir@ | |
147 | +mandir= @mandir@ | |
148 | +sbindir= @sbindir@ | |
149 | ||
150 | @MCONFIG@ | |
151 | ||
e918a170 | 152 | @@ -17,8 +20,7 @@ |
caaedc87 | 153 | utilities.c |
154 | OBJS= dirs.o interactive.o main.o restore.o symtab.o tape.o \ | |
155 | utilities.o ../common/dumprmt.o | |
156 | -MAN8= restore.8 | |
0734a820 | 157 | -RMAN8= rrestore.8 |
caaedc87 | 158 | +MAN8= restore.8 rrestore.8 |
159 | ||
0734a820 | 160 | all:: $(PROG) $(MAN8) |
caaedc87 | 161 | |
e918a170 | 162 | @@ -30,11 +32,10 @@ |
caaedc87 | 163 | -e "s|__VERSION__|$(VERSION)|g" $< > $@ |
164 | ||
165 | install:: all | |
0734a820 | 166 | - $(INSTALL) -d $(SBINDIR) $(MANDIR) |
167 | - $(INSTALLBIN) $(PROG) $(SBINDIR) | |
e918a170 | 168 | - $(INSTALLMAN) $(MAN8) $(MANDIR) |
0734a820 | 169 | - cd $(SBINDIR) && $(RM) -f $(RPROG) && $(LN_S) $(PROG) $(RPROG) |
170 | - cd $(MANDIR) && $(RM) -f $(RMAN8) && $(LN_S) $(MAN8) $(RMAN8) | |
caaedc87 | 171 | + $(INSTALL) -d $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir)/man8 |
172 | + $(INSTALLBIN) $(PROG) $(DESTDIR)$(sbindir) | |
e918a170 JB |
173 | + $(LN_S) restore $(DESTDIR)$(sbindir)/rrestore |
174 | + $(INSTALLMAN) $(MAN8) $(DESTDIR)$(mandir)/man8 | |
caaedc87 | 175 | |
176 | clean:: | |
0734a820 | 177 | $(RM) -f $(PROG) $(MAN8) \#* *.s *.o *.a *~ core |
e918a170 JB |
178 | diff -Nur dump-0.4b32.orig/restore/rrestore.8 dump-0.4b32/restore/rrestore.8 |
179 | --- dump-0.4b32.orig/restore/rrestore.8 Thu Jan 1 01:00:00 1970 | |
180 | +++ dump-0.4b32/restore/rrestore.8 Mon Nov 18 15:51:55 2002 | |
caaedc87 | 181 | @@ -0,0 +1 @@ |
182 | +.so restore.8 | |
e918a170 JB |
183 | diff -Nur dump-0.4b32.orig/rmt/Makefile.in dump-0.4b32/rmt/Makefile.in |
184 | --- dump-0.4b32.orig/rmt/Makefile.in Mon Jul 29 14:00:34 2002 | |
185 | +++ dump-0.4b32/rmt/Makefile.in Mon Nov 18 15:51:55 2002 | |
186 | @@ -1,7 +1,10 @@ | |
187 | # $Id$ | |
0734a820 | 188 | |
e918a170 | 189 | +top_builddir= .. |
0734a820 | 190 | top_srcdir= @top_srcdir@ |
191 | srcdir= @srcdir@ | |
192 | +sbindir= @sbindir@ | |
193 | +mandir= @mandir@ | |
194 | ||
195 | @MCONFIG@ | |
196 | ||
e918a170 | 197 | @@ -25,9 +28,9 @@ |
caaedc87 | 198 | -e "s|__VERSION__|$(VERSION)|g" $< > $@ |
199 | ||
200 | install:: all | |
0734a820 | 201 | - $(INSTALL) -d $(SBINDIR) $(MANDIR) |
202 | - $(INSTALLBIN) $(PROG) $(SBINDIR) | |
caaedc87 | 203 | - $(INSTALLMAN) $(srcdir)/$(MAN8) $(MANDIR) |
204 | + $(INSTALL) -d $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir)/man8 | |
205 | + $(INSTALLBIN) $(PROG) $(DESTDIR)$(sbindir) | |
206 | + $(INSTALLMAN) $(MAN8) $(DESTDIR)$(mandir)/man8 | |
207 | ||
208 | clean:: | |
209 | rm -f $(PROG) \#* *.s *.o *.a *~ core rmt.8 |