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