]>
Commit | Line | Data |
---|---|---|
0734a820 | 1 | diff -Nru dump-0.4b22/MCONFIG.in dump-0.4b22.new/MCONFIG.in |
2 | --- dump-0.4b22/MCONFIG.in Sat May 12 13:39:45 2001 | |
3 | +++ dump-0.4b22.new/MCONFIG.in Sun May 13 02:09:29 2001 | |
4 | @@ -26,8 +26,8 @@ | |
5 | ||
6 | prefix= @prefix@ | |
7 | exec_prefix= @exec_prefix@ | |
8 | -SBINDIR= @sbindir@ | |
9 | -MANDIR= @mandir@/man8 | |
10 | +sbindir= @sbindir@ | |
caaedc87 | 11 | +mandir= @mandir@ |
12 | ||
13 | DUMPDATESPATH= @DUMPDATESPATH@ | |
14 | # | |
0734a820 | 15 | diff -Nru dump-0.4b22/dump/Makefile.in dump-0.4b22.new/dump/Makefile.in |
16 | --- dump-0.4b22/dump/Makefile.in Thu Apr 12 18:03:29 2001 | |
17 | +++ dump-0.4b22.new/dump/Makefile.in Sun May 13 02:22:22 2001 | |
18 | @@ -12,12 +12,10 @@ | |
caaedc87 | 19 | |
20 | PROG= dump | |
0734a820 | 21 | RPROG= rdump |
22 | -LINKS= ${SBINDIR}/dump ${SBINDIR}/rdump | |
caaedc87 | 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 | |
0734a820 | 27 | -RMAN8= rdump.8 |
caaedc87 | 28 | +MAN8= dump.8 rdump.8 |
29 | ||
0734a820 | 30 | all:: $(PROG) $(MAN8) |
caaedc87 | 31 | |
0734a820 | 32 | @@ -30,11 +28,10 @@ |
caaedc87 | 33 | -e "s|__VERSION__|$(VERSION)|g" $< > $@ |
34 | ||
35 | install:: all | |
0734a820 | 36 | - $(INSTALL) -d $(SBINDIR) $(MANDIR) |
37 | - $(INSTALLBIN) $(PROG) $(SBINDIR) | |
caaedc87 | 38 | - $(INSTALLMAN) $(srcdir)/$(MAN8) $(MANDIR) |
0734a820 | 39 | - cd $(SBINDIR) && $(RM) -f $(RPROG) && $(LN_S) $(PROG) $(RPROG) |
40 | - cd $(MANDIR) && $(RM) -f $(RMAN8) && $(LN_S) $(MAN8) $(RMAN8) | |
caaedc87 | 41 | + $(INSTALL) -d $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir)/man8 |
42 | + $(INSTALLBIN) $(PROG) $(DESTDIR)$(sbindir) | |
43 | + $(LN_S) dump $(DESTDIR)$(sbindir)/rdump | |
44 | + $(INSTALLMAN) $(MAN8) $(DESTDIR)$(mandir)/man8 | |
45 | ||
46 | clean:: | |
0734a820 | 47 | $(RM) -f $(PROG) $(MAN8) \#* *.s *.o *.a *~ core |
48 | diff -Nru dump-0.4b22/dump/rdump.8 dump-0.4b22.new/dump/rdump.8 | |
49 | --- dump-0.4b22/dump/rdump.8 Thu Jan 1 01:00:00 1970 | |
50 | +++ dump-0.4b22.new/dump/rdump.8 Sun May 13 02:08:51 2001 | |
caaedc87 | 51 | @@ -0,0 +1 @@ |
52 | +.so dump.8 | |
0734a820 | 53 | diff -Nru dump-0.4b22/restore/Makefile.in dump-0.4b22.new/restore/Makefile.in |
54 | --- dump-0.4b22/restore/Makefile.in Thu Apr 12 18:03:30 2001 | |
55 | +++ dump-0.4b22.new/restore/Makefile.in Sun May 13 02:18:31 2001 | |
56 | @@ -2,6 +2,8 @@ | |
57 | ||
58 | top_srcdir= @top_srcdir@ | |
59 | srcdir= @srcdir@ | |
60 | +mandir= @mandir@ | |
61 | +sbindir= @sbindir@ | |
62 | ||
63 | @MCONFIG@ | |
64 | ||
65 | @@ -17,8 +19,7 @@ | |
caaedc87 | 66 | utilities.c |
67 | OBJS= dirs.o interactive.o main.o restore.o symtab.o tape.o \ | |
68 | utilities.o ../common/dumprmt.o | |
69 | -MAN8= restore.8 | |
0734a820 | 70 | -RMAN8= rrestore.8 |
caaedc87 | 71 | +MAN8= restore.8 rrestore.8 |
72 | ||
0734a820 | 73 | all:: $(PROG) $(MAN8) |
caaedc87 | 74 | |
0734a820 | 75 | @@ -30,11 +31,9 @@ |
caaedc87 | 76 | -e "s|__VERSION__|$(VERSION)|g" $< > $@ |
77 | ||
78 | install:: all | |
0734a820 | 79 | - $(INSTALL) -d $(SBINDIR) $(MANDIR) |
80 | - $(INSTALLBIN) $(PROG) $(SBINDIR) | |
caaedc87 | 81 | - $(INSTALLMAN) $(srcdir)/$(MAN8) $(MANDIR) |
0734a820 | 82 | - cd $(SBINDIR) && $(RM) -f $(RPROG) && $(LN_S) $(PROG) $(RPROG) |
83 | - cd $(MANDIR) && $(RM) -f $(RMAN8) && $(LN_S) $(MAN8) $(RMAN8) | |
caaedc87 | 84 | + $(INSTALL) -d $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir)/man8 |
85 | + $(INSTALLBIN) $(PROG) $(DESTDIR)$(sbindir) | |
0734a820 | 86 | + $(INSTALLMAN) $(srcdir)/$(MAN8) $(DESTDIR)$(mandir)/man8 |
caaedc87 | 87 | |
88 | clean:: | |
0734a820 | 89 | $(RM) -f $(PROG) $(MAN8) \#* *.s *.o *.a *~ core |
90 | diff -Nru dump-0.4b22/restore/rrestore.8 dump-0.4b22.new/restore/rrestore.8 | |
91 | --- dump-0.4b22/restore/rrestore.8 Thu Jan 1 01:00:00 1970 | |
92 | +++ dump-0.4b22.new/restore/rrestore.8 Sun May 13 02:08:51 2001 | |
caaedc87 | 93 | @@ -0,0 +1 @@ |
94 | +.so restore.8 | |
0734a820 | 95 | diff -Nru dump-0.4b22/rmt/Makefile.in dump-0.4b22.new/rmt/Makefile.in |
96 | --- dump-0.4b22/rmt/Makefile.in Fri Apr 6 12:09:40 2001 | |
97 | +++ dump-0.4b22.new/rmt/Makefile.in Sun May 13 02:20:27 2001 | |
98 | @@ -2,6 +2,8 @@ | |
99 | ||
100 | top_srcdir= @top_srcdir@ | |
101 | srcdir= @srcdir@ | |
102 | +sbindir= @sbindir@ | |
103 | +mandir= @mandir@ | |
104 | ||
105 | @MCONFIG@ | |
106 | ||
107 | @@ -30,9 +32,9 @@ | |
caaedc87 | 108 | -e "s|__VERSION__|$(VERSION)|g" $< > $@ |
109 | ||
110 | install:: all | |
0734a820 | 111 | - $(INSTALL) -d $(SBINDIR) $(MANDIR) |
112 | - $(INSTALLBIN) $(PROG) $(SBINDIR) | |
caaedc87 | 113 | - $(INSTALLMAN) $(srcdir)/$(MAN8) $(MANDIR) |
114 | + $(INSTALL) -d $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir)/man8 | |
115 | + $(INSTALLBIN) $(PROG) $(DESTDIR)$(sbindir) | |
116 | + $(INSTALLMAN) $(MAN8) $(DESTDIR)$(mandir)/man8 | |
117 | ||
118 | clean:: | |
119 | rm -f $(PROG) \#* *.s *.o *.a *~ core rmt.8 | |
0734a820 | 120 | --- dump-0.4b22/Makefile.in~ Tue Nov 2 10:35:55 1999 |
121 | +++ dump-0.4b22/Makefile.in Sun May 13 02:25:34 2001 | |
122 | @@ -8,7 +8,7 @@ | |
123 | ||
124 | all clean install dep depend realclean distclean:: | |
125 | for i in $(SUBDIRS); do \ | |
126 | - (cd $$i && $(MAKE) $@) || exit 1; \ | |
127 | + (cd $$i && $(MAKE) DESTDIR=$(DESTDIR) $@) || exit 1; \ | |
128 | done | |
129 | ||
130 | distclean:: |