]>
Commit | Line | Data |
---|---|---|
e39e925d | 1 | diff -Nru adns-1.0/Makefile.in adns-1.0.new/Makefile.in |
2 | --- adns-1.0/Makefile.in Sun Sep 17 16:10:57 2000 | |
3 | +++ adns-1.0.new/Makefile.in Mon Nov 19 02:34:14 2001 | |
4 | @@ -38,7 +38,7 @@ | |
5 | SUBDIRS= src $(SUBDIRS_DYNAMIC) client regress | |
6 | ||
7 | all install uninstall clean distclean mostlyclean maintainer-clean distprep: | |
8 | - set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done | |
9 | + set -e; for d in $(SUBDIRS); do $(MAKE) DESTDIR=$(DESTDIR) -C $$d $@; done | |
10 | $(MAKE) $@-here | |
11 | ||
12 | all-here install-here uninstall-here distprep-here: README | |
13 | diff -Nru adns-1.0/client/Makefile.in adns-1.0.new/client/Makefile.in | |
14 | --- adns-1.0/client/Makefile.in Sun Sep 17 02:43:10 2000 | |
15 | +++ adns-1.0.new/client/Makefile.in Mon Nov 19 02:36:50 2001 | |
16 | @@ -59,11 +59,12 @@ | |
17 | all: $(TARGETS) | |
18 | ||
19 | install: $(TARG_INSTALL) | |
20 | + $(INSTALL) -d $(DESTDIR)$(bindir) | |
21 | set -xe; for f in $(TARG_INSTALL); \ | |
22 | - do $(INSTALL_PROGRAM) $$f $(bin_dir)/$$f; done | |
23 | + do $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bindir)/$$f; done | |
24 | ||
25 | uninstall: | |
26 | - for f in $(TARGETS); do rm -f $(bin_dir)/$$f; done | |
27 | + for f in $(TARGETS); do rm -f $(DESTDIR)$(bindir)/$$f; done | |
28 | ||
29 | adnshost: $(ADH_OBJS) $(DYNAMIC_DEP) | |
30 | $(CC) $(LDFLAGS) $(ADH_OBJS) $(DYNAMIC_LINK) -o $@ $(LDLIBS) | |
31 | diff -Nru adns-1.0/settings.make.in adns-1.0.new/settings.make.in | |
32 | --- adns-1.0/settings.make.in Sun Sep 17 03:01:11 2000 | |
33 | +++ adns-1.0.new/settings.make.in Mon Nov 19 02:36:25 2001 | |
34 | @@ -47,10 +47,10 @@ | |
35 | MKSHLIB_3= @MKSHLIB_3@ | |
36 | ||
37 | prefix= @prefix@ | |
38 | -exec_prefix= @exec_prefix@ | |
39 | -bin_dir= $(exec_prefix)/bin | |
40 | -lib_dir= $(exec_prefix)/lib | |
41 | -include_dir= $(prefix)/include | |
42 | +execprefix= @execprefix@ | |
43 | +bindir= @bindir@ | |
44 | +libdir= @libdir@ | |
45 | +includedir= @includedir@ | |
46 | ||
47 | AC_INSTALL= @INSTALL@ | |
48 | ifeq ($(AC_INSTALL),./install-sh -c) | |
49 | diff -Nru adns-1.0/src/Makefile.in adns-1.0.new/src/Makefile.in | |
50 | --- adns-1.0/src/Makefile.in Sun Sep 17 02:24:24 2000 | |
51 | +++ adns-1.0.new/src/Makefile.in Mon Nov 19 02:35:18 2001 | |
52 | @@ -29,13 +29,14 @@ | |
53 | include adns.make | |
54 | ||
55 | install: | |
56 | + $(INSTALL) -d $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) | |
57 | set -xe; for f in $(TARGETS); \ | |
58 | - do $(INSTALL_DATA) $$f $(lib_dir)/$$f; done | |
59 | - $(INSTALL_DATA) $(srcdir)/../src/adns.h $(include_dir)/adns.h | |
60 | + do $(INSTALL_DATA) $$f $(DESTDIR)$(libdir)/$$f; done | |
61 | + $(INSTALL_DATA) $(srcdir)/../src/adns.h $(DESTDIR)$(includedir)/adns.h | |
62 | ||
63 | uninstall: | |
64 | - for f in $(TARGETS); do rm -f $(lib_dir)/$$f; done | |
65 | - rm -f $(include_dir)/adns.h | |
66 | + for f in $(TARGETS); do rm -f $(DESTDIR)$(libdir)/$$f; done | |
67 | + rm -f $(DESTDIR)$(includedir)/adns.h | |
68 | ||
69 | ALLOBJS= $(LIBOBJS) | |
70 | ||
71 | --- adns-1.0/dynamic/Makefile.in~ Mon Nov 19 03:01:54 2001 | |
72 | +++ adns-1.0/dynamic/Makefile.in Mon Nov 19 03:01:54 2001 | |
73 | @@ -31,11 +31,12 @@ | |
74 | ALLOBJS= $(addsuffix _p.o, $(basename $(LIBOBJS))) | |
75 | ||
76 | install: | |
77 | - $(INSTALL_PROGRAM) $(SHLIBFILE) $(lib_dir)/$(SHLIBFILE) | |
78 | - ln -sf $(SHLIBFILE) $(lib_dir)/$(SHLIBSONAME) | |
79 | + $(INSTALL) -d $(DESTDIR)$(libdir) | |
80 | + $(INSTALL_PROGRAM) $(SHLIBFILE) $(DESTDIR)$(libdir)/$(SHLIBFILE) | |
81 | + ln -sf $(SHLIBFILE) $(DESTDIR)$(libdir)/$(SHLIBSONAME) | |
82 | ||
83 | uninstall: | |
84 | - rm -f $(lib_dir)/$(SHLIBFILE) $(lib_dir)/$(SHLIBSONAME) | |
85 | + rm -f $(DESTDIR)$(libdir)/$(SHLIBFILE) $(DESTDIR)$(libdir)/$(SHLIBSONAME) | |
86 | ||
87 | $(SHLIBFORLINK): | |
88 | ln -s $(SHLIBSONAME) $(SHLIBFORLINK) |