]>
Commit | Line | Data |
---|---|---|
cba05e3c | 1 | --- dump-0.4b33/dump/Makefile.in.orig Tue Feb 11 23:18:12 2003 |
2 | +++ dump-0.4b33/dump/Makefile.in Tue Feb 11 23:19:54 2003 | |
3 | @@ -13,12 +13,10 @@ | |
caaedc87 | 4 | |
5 | PROG= dump | |
0734a820 | 6 | RPROG= rdump |
7 | -LINKS= ${SBINDIR}/dump ${SBINDIR}/rdump | |
caaedc87 | 8 | SRCS= itime.c main.c optr.c tape.c traverse.c unctime.c |
9 | OBJS= itime.o main.o optr.o tape.o traverse.o unctime.o \ | |
10 | ../common/dumprmt.o | |
11 | -MAN8= dump.8 | |
0734a820 | 12 | -RMAN8= rdump.8 |
caaedc87 | 13 | +MAN8= dump.8 rdump.8 |
14 | ||
0734a820 | 15 | all:: $(PROG) $(MAN8) |
caaedc87 | 16 | |
cba05e3c | 17 | @@ -31,11 +29,11 @@ |
caaedc87 | 18 | -e "s|__VERSION__|$(VERSION)|g" $< > $@ |
19 | ||
20 | install:: all | |
0734a820 | 21 | - $(INSTALL) -d $(SBINDIR) $(MANDIR) |
22 | - $(INSTALLBIN) $(PROG) $(SBINDIR) | |
e918a170 | 23 | - $(INSTALLMAN) $(MAN8) $(MANDIR) |
0734a820 | 24 | - cd $(SBINDIR) && $(RM) -f $(RPROG) && $(LN_S) $(PROG) $(RPROG) |
25 | - cd $(MANDIR) && $(RM) -f $(RMAN8) && $(LN_S) $(MAN8) $(RMAN8) | |
cba05e3c | 26 | + $(INSTALL) -d $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir) |
caaedc87 | 27 | + $(INSTALLBIN) $(PROG) $(DESTDIR)$(sbindir) |
28 | + $(LN_S) dump $(DESTDIR)$(sbindir)/rdump | |
cba05e3c | 29 | + $(INSTALLMAN) $(MAN8) $(DESTDIR)$(mandir) |
30 | + | |
caaedc87 | 31 | |
32 | clean:: | |
0734a820 | 33 | $(RM) -f $(PROG) $(MAN8) \#* *.s *.o *.a *~ core |
cba05e3c | 34 | --- dump-0.4b33/restore/Makefile.in.orig Tue Feb 11 23:21:04 2003 |
35 | +++ dump-0.4b33/restore/Makefile.in Tue Feb 11 23:21:57 2003 | |
36 | @@ -18,8 +18,7 @@ | |
caaedc87 | 37 | utilities.c |
38 | OBJS= dirs.o interactive.o main.o restore.o symtab.o tape.o \ | |
39 | utilities.o ../common/dumprmt.o | |
40 | -MAN8= restore.8 | |
0734a820 | 41 | -RMAN8= rrestore.8 |
caaedc87 | 42 | +MAN8= restore.8 rrestore.8 |
43 | ||
0734a820 | 44 | all:: $(PROG) $(MAN8) |
caaedc87 | 45 | |
cba05e3c | 46 | @@ -31,11 +30,11 @@ |
caaedc87 | 47 | -e "s|__VERSION__|$(VERSION)|g" $< > $@ |
48 | ||
49 | install:: all | |
0734a820 | 50 | - $(INSTALL) -d $(SBINDIR) $(MANDIR) |
51 | - $(INSTALLBIN) $(PROG) $(SBINDIR) | |
e918a170 | 52 | - $(INSTALLMAN) $(MAN8) $(MANDIR) |
0734a820 | 53 | - cd $(SBINDIR) && $(RM) -f $(RPROG) && $(LN_S) $(PROG) $(RPROG) |
54 | - cd $(MANDIR) && $(RM) -f $(RMAN8) && $(LN_S) $(MAN8) $(RMAN8) | |
cba05e3c | 55 | + $(INSTALL) -d $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir) |
caaedc87 | 56 | + $(INSTALLBIN) $(PROG) $(DESTDIR)$(sbindir) |
e918a170 | 57 | + $(LN_S) restore $(DESTDIR)$(sbindir)/rrestore |
cba05e3c | 58 | + $(INSTALLMAN) $(MAN8) $(DESTDIR)$(mandir) |
59 | + | |
caaedc87 | 60 | |
61 | clean:: | |
0734a820 | 62 | $(RM) -f $(PROG) $(MAN8) \#* *.s *.o *.a *~ core |
cba05e3c | 63 | --- dump-0.4b33/rmt/Makefile.in.orig Tue Feb 11 23:22:03 2003 |
64 | +++ dump-0.4b33/rmt/Makefile.in Tue Feb 11 23:23:07 2003 | |
65 | @@ -3,6 +3,8 @@ | |
0734a820 | 66 | top_srcdir= @top_srcdir@ |
67 | srcdir= @srcdir@ | |
cba05e3c | 68 | top_builddir= .. |
0734a820 | 69 | +sbindir= @sbindir@ |
70 | +mandir= @mandir@ | |
71 | ||
72 | @MCONFIG@ | |
73 | ||
cba05e3c | 74 | @@ -26,9 +28,10 @@ |
caaedc87 | 75 | -e "s|__VERSION__|$(VERSION)|g" $< > $@ |
76 | ||
77 | install:: all | |
0734a820 | 78 | - $(INSTALL) -d $(SBINDIR) $(MANDIR) |
79 | - $(INSTALLBIN) $(PROG) $(SBINDIR) | |
caaedc87 | 80 | - $(INSTALLMAN) $(srcdir)/$(MAN8) $(MANDIR) |
cba05e3c | 81 | + $(INSTALL) -d $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir) |
caaedc87 | 82 | + $(INSTALLBIN) $(PROG) $(DESTDIR)$(sbindir) |
cba05e3c | 83 | + $(INSTALLMAN) $(MAN8) $(DESTDIR)$(mandir) |
84 | + | |
caaedc87 | 85 | |
86 | clean:: | |
87 | rm -f $(PROG) \#* *.s *.o *.a *~ core rmt.8 | |
cba05e3c | 88 | --- dump-0.4b33/MCONFIG.in.orig Tue Feb 11 23:11:18 2003 |
89 | +++ dump-0.4b33/MCONFIG.in Tue Feb 11 23:11:43 2003 | |
90 | @@ -22,8 +22,8 @@ | |
91 | ||
92 | prefix= @prefix@ | |
93 | exec_prefix= @exec_prefix@ | |
94 | -SBINDIR= @sbindir@ | |
95 | -MANDIR= @mandir@/man8 | |
96 | +sbindir= @sbindir@ | |
97 | +mandir= @mandir@/man8 | |
98 | ||
99 | DUMPDATESPATH= @DUMPDATESPATH@ | |
100 | # | |
101 | --- dump-0.4b33/Makefile.in.orig Tue Feb 11 23:14:05 2003 | |
102 | +++ dump-0.4b33/Makefile.in Tue Feb 11 23:14:42 2003 | |
103 | @@ -9,7 +9,7 @@ | |
104 | ||
105 | all clean install dep depend realclean distclean:: | |
106 | for i in $(SUBDIRS); do \ | |
107 | - (cd $$i && $(MAKE) $@) || exit 1; \ | |
108 | + (cd $$i && $(MAKE) DESTDIR=$(DESTDIR) $@) || exit 1; \ | |
109 | done | |
110 | ||
111 | distclean:: | |
d26a6f9d JB |
112 | --- dump-0.4b35/configure.in.orig 2003-04-10 08:25:21.000000000 +0000 |
113 | +++ dump-0.4b35/configure.in 2003-11-23 12:46:11.000000000 +0000 | |
114 | @@ -498,12 +498,6 @@ | |
cba05e3c | 115 | AC_CHECK_TYPE(u_quad_t, uint64_t) |
116 | ||
117 | dnl | |
118 | -dnl Compute top_buildir | |
119 | -dnl | |
120 | -top_builddir=`cd .; pwd` | |
121 | -AC_SUBST(top_builddir) | |
122 | - | |
123 | -dnl | |
124 | dnl Create directories | |
125 | dnl | |
126 | test -d compat || mkdir compat | |
3811975b | 127 | @@ -512,4 +507,5 @@ |
cba05e3c | 128 | dnl |
129 | dnl Output files | |
130 | dnl | |
131 | -AC_OUTPUT(MCONFIG Makefile common/Makefile compat/include/Makefile compat/lib/Makefile dump/Makefile restore/Makefile $RMTMAKEFILE) | |
132 | +AC_CONFIG_FILES([MCONFIG Makefile common/Makefile compat/include/Makefile compat/lib/Makefile dump/Makefile restore/Makefile $RMTMAKEFILE]) | |
133 | +AC_OUTPUT | |
134 | --- dump-0.4b33.orig/restore/rrestore.8 Thu Jan 1 01:00:00 1970 | |
135 | +++ dump-0.4b33/restore/rrestore.8 Mon Nov 18 15:51:55 2002 | |
136 | @@ -0,0 +1 @@ | |
137 | +.so restore.8 | |
138 | --- dump-0.4b32.orig/dump/rdump.8 Thu Jan 1 01:00:00 1970 | |
139 | +++ dump-0.4b32/dump/rdump.8 Mon Nov 18 15:51:55 2002 | |
140 | @@ -0,0 +1 @@ | |
141 | +.so dump.8 |