]>
Commit | Line | Data |
---|---|---|
caaedc87 | 1 | diff -Nru dump-0.4b17/MCONFIG.in dump-0.4b17.new/MCONFIG.in |
2 | --- dump-0.4b17/MCONFIG.in Thu Jun 1 22:49:32 2000 | |
3 | +++ dump-0.4b17.new/MCONFIG.in Sat Jun 3 09:33:50 2000 | |
4 | @@ -24,8 +24,8 @@ | |
5 | INSTALLBIN= $(INSTALL) -o $(BINOWNER) -g $(BINGRP) -m $(BINMODE) | |
6 | INSTALLMAN= $(INSTALL) -o $(MANOWNER) -g $(MANGRP) -m $(MANMODE) | |
7 | ||
8 | -BINDIR= /sbin | |
9 | -MANDIR= /usr/man/man8 | |
10 | +sbindir= /sbin | |
11 | +mandir= @mandir@ | |
12 | ||
13 | DUMPDATESPATH= @DUMPDATESPATH@ | |
14 | # | |
15 | diff -Nru dump-0.4b17/dump/Makefile.in dump-0.4b17.new/dump/Makefile.in | |
16 | --- dump-0.4b17/dump/Makefile.in Mon Oct 11 15:31:10 1999 | |
17 | +++ dump-0.4b17.new/dump/Makefile.in Sat Jun 3 09:39:02 2000 | |
18 | @@ -11,12 +11,10 @@ | |
19 | DEPLIBS= ../compat/lib/libcompat.a | |
20 | ||
21 | PROG= dump | |
22 | -LINKS= ${BINDIR}/dump ${BINDIR}/rdump | |
23 | SRCS= itime.c main.c optr.c tape.c traverse.c unctime.c | |
24 | OBJS= itime.o main.o optr.o tape.o traverse.o unctime.o \ | |
25 | ../common/dumprmt.o | |
26 | -MAN8= dump.8 | |
27 | -MLINKS= dump.8 $(MANDIR)/rdump.8 | |
28 | +MAN8= dump.8 rdump.8 | |
29 | ||
30 | all:: $(PROG) dump.8 | |
31 | ||
32 | @@ -29,18 +27,10 @@ | |
33 | -e "s|__VERSION__|$(VERSION)|g" $< > $@ | |
34 | ||
35 | install:: all | |
36 | - $(INSTALLBIN) $(PROG) $(BINDIR) | |
37 | - $(INSTALLMAN) $(srcdir)/$(MAN8) $(MANDIR) | |
38 | - @set $(LINKS) $(MLINKS); \ | |
39 | - while test $$# -ge 2; do \ | |
40 | - l=$(DESTDIR)$$1; \ | |
41 | - shift; \ | |
42 | - t=$(DESTDIR)$$1; \ | |
43 | - shift; \ | |
44 | - echo $$t -\> $$l; \ | |
45 | - $(RM) -f $$t; \ | |
46 | - $(LN_S) $$l $$t; \ | |
47 | - done; true | |
48 | + $(INSTALL) -d $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir)/man8 | |
49 | + $(INSTALLBIN) $(PROG) $(DESTDIR)$(sbindir) | |
50 | + $(LN_S) dump $(DESTDIR)$(sbindir)/rdump | |
51 | + $(INSTALLMAN) $(MAN8) $(DESTDIR)$(mandir)/man8 | |
52 | ||
53 | clean:: | |
54 | $(RM) -f $(PROG) \#* *.s *.o *.a *~ core dump.8 | |
55 | diff -Nru dump-0.4b17/dump/rdump.8 dump-0.4b17.new/dump/rdump.8 | |
56 | --- dump-0.4b17/dump/rdump.8 Thu Jan 1 01:00:00 1970 | |
57 | +++ dump-0.4b17.new/dump/rdump.8 Sat Jun 3 09:30:39 2000 | |
58 | @@ -0,0 +1 @@ | |
59 | +.so dump.8 | |
60 | diff -Nru dump-0.4b17/restore/Makefile.in dump-0.4b17.new/restore/Makefile.in | |
61 | --- dump-0.4b17/restore/Makefile.in Mon May 29 16:17:37 2000 | |
62 | +++ dump-0.4b17.new/restore/Makefile.in Sat Jun 3 09:37:23 2000 | |
63 | @@ -16,8 +16,7 @@ | |
64 | utilities.c | |
65 | OBJS= dirs.o interactive.o main.o restore.o symtab.o tape.o \ | |
66 | utilities.o ../common/dumprmt.o | |
67 | -MAN8= restore.8 | |
68 | -MLINKS= restore.8 $(MANDIR)/rrestore.8 | |
69 | +MAN8= restore.8 rrestore.8 | |
70 | ||
71 | all:: $(PROG) restore.8 | |
72 | ||
73 | @@ -29,18 +28,10 @@ | |
74 | -e "s|__VERSION__|$(VERSION)|g" $< > $@ | |
75 | ||
76 | install:: all | |
77 | - $(INSTALLBIN) $(PROG) $(BINDIR) | |
78 | - $(INSTALLMAN) $(srcdir)/$(MAN8) $(MANDIR) | |
79 | - @set $(LINKS) $(MLINKS); \ | |
80 | - while test $$# -ge 2; do \ | |
81 | - l=$(DESTDIR)$$1; \ | |
82 | - shift; \ | |
83 | - t=$(DESTDIR)$$1; \ | |
84 | - shift; \ | |
85 | - echo $$t -\> $$l; \ | |
86 | - $(RM) -f $$t; \ | |
87 | - $(LN_S) $$l $$t; \ | |
88 | - done; true | |
89 | + $(INSTALL) -d $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir)/man8 | |
90 | + $(INSTALLBIN) $(PROG) $(DESTDIR)$(sbindir) | |
91 | + $(LN_S) restore $(DESTDIR)$(sbindir)/rrestore | |
92 | + $(INSTALLMAN) $(MAN8) $(DESTDIR)$(mandir)/man8 | |
93 | ||
94 | clean:: | |
95 | $(RM) -f $(PROG) \#* *.s *.o *.a *~ core restore.8 | |
96 | diff -Nru dump-0.4b17/restore/rrestore.8 dump-0.4b17.new/restore/rrestore.8 | |
97 | --- dump-0.4b17/restore/rrestore.8 Thu Jan 1 01:00:00 1970 | |
98 | +++ dump-0.4b17.new/restore/rrestore.8 Sat Jun 3 09:30:09 2000 | |
99 | @@ -0,0 +1 @@ | |
100 | +.so restore.8 | |
101 | diff -Nru dump-0.4b17/rmt/Makefile.in dump-0.4b17.new/rmt/Makefile.in | |
102 | --- dump-0.4b17/rmt/Makefile.in Mon Oct 11 15:31:14 1999 | |
103 | +++ dump-0.4b17.new/rmt/Makefile.in Sat Jun 3 09:39:22 2000 | |
104 | @@ -30,8 +30,9 @@ | |
105 | -e "s|__VERSION__|$(VERSION)|g" $< > $@ | |
106 | ||
107 | install:: all | |
108 | - $(INSTALLBIN) $(PROG) $(BINDIR) | |
109 | - $(INSTALLMAN) $(srcdir)/$(MAN8) $(MANDIR) | |
110 | + $(INSTALL) -d $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir)/man8 | |
111 | + $(INSTALLBIN) $(PROG) $(DESTDIR)$(sbindir) | |
112 | + $(INSTALLMAN) $(MAN8) $(DESTDIR)$(mandir)/man8 | |
113 | ||
114 | clean:: | |
115 | rm -f $(PROG) \#* *.s *.o *.a *~ core rmt.8 |