Contents of /trunk/mdnsresponder/patches/mdnsresponder-107-makefiles.patch
Parent Directory | Revision Log
Revision 153 -
(show annotations)
(download)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 3631 byte(s)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 3631 byte(s)
-import
1 | --- mDNSResponder-98/mDNSPosix/Makefile.orig 2005-01-27 22:55:00.000000000 +0000 |
2 | +++ mDNSResponder-98/mDNSPosix/Makefile 2005-02-06 18:13:21.437292552 +0000 |
3 | @@ -369,7 +369,7 @@ |
4 | |
5 | all: setup Daemon libdns_sd Client Responder ProxyResponder Identify NetMonitor dnsextd $(OPTIONALTARG) |
6 | |
7 | -install: setup InstalledDaemon InstalledLib InstalledStartup InstalledManPages $(OPTINSTALL) |
8 | +install: setup InstalledDaemon InstalledLib InstalledManPages $(OPTINSTALL) |
9 | |
10 | # 'setup' sets up the build directory structure the way we want |
11 | setup: |
12 | @@ -418,36 +418,32 @@ |
13 | ############################################################################# |
14 | |
15 | # The Install targets place built stuff in their proper places |
16 | -InstalledDaemon: $(INSTBASE)/sbin/mdnsd |
17 | +InstalledDaemon: ${DESTDIR}/$(INSTBASE)/sbin/mdnsd |
18 | @echo $+ " installed" |
19 | |
20 | -InstalledLib: $(INSTBASE)/lib/libdns_sd.$(LDSUFFIX).$(LIBVERS) $(INSTBASE)/include/dns_sd.h |
21 | +InstalledLib: ${DESTDIR}/$(INSTBASE)/lib/libdns_sd.$(LDSUFFIX).$(LIBVERS) ${DESTDIR}/$(INSTBASE)/include/dns_sd.h |
22 | @echo $+ " installed" |
23 | |
24 | -InstalledStartup: $(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME) |
25 | +InstalledStartup: ${DESTDIR}/$(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME) |
26 | @echo $+ " installed" |
27 | |
28 | -InstalledNSS: $(NSSINSTPATH)/$(NSSLINKNAME) /etc/nss_mdns.conf $(MANPATH)/man5/nss_mdns.conf.5 $(MANPATH)/man8/libnss_mdns.8 |
29 | +InstalledNSS: ${DESTDIR}/$(NSSINSTPATH)/$(NSSLINKNAME) ${DESTDIR}/etc/nss_mdns.conf ${DESTDIR}/$(MANPATH)/man5/nss_mdns.conf.5 ${DESTDIR}/$(MANPATH)/man8/libnss_mdns.8 |
30 | @echo $+ " installed" |
31 | |
32 | -InstalledManPages: $(MANPATH)/man8/mdnsd.8 |
33 | +InstalledManPages: ${DESTDIR}/$(MANPATH)/man8/mdnsd.8 |
34 | @echo $+ " installed" |
35 | |
36 | -$(INSTBASE)/sbin/mdnsd: $(BUILDDIR)/mdnsd |
37 | +${DESTDIR}/$(INSTBASE)/sbin/mdnsd: $(BUILDDIR)/mdnsd |
38 | $(CP) $< $@ |
39 | |
40 | -$(INSTBASE)/lib/libdns_sd.$(LDSUFFIX).$(LIBVERS): $(BUILDDIR)/libdns_sd.$(LDSUFFIX) |
41 | +${DESTDIR}/$(INSTBASE)/lib/libdns_sd.$(LDSUFFIX).$(LIBVERS): $(BUILDDIR)/libdns_sd.$(LDSUFFIX) |
42 | $(CP) $< $@ |
43 | - $(LN) $@ $(INSTBASE)/lib/libdns_sd.$(LDSUFFIX) |
44 | -ifdef LDCONFIG |
45 | - # -m means 'merge into existing database', -R means 'rescan directories' |
46 | - $(LDCONFIG) -mR |
47 | -endif |
48 | + $(LN) $@ ${DESTDIR}/$(INSTBASE)/lib/libdns_sd.$(LDSUFFIX) |
49 | |
50 | -$(INSTBASE)/include/dns_sd.h: $(SHAREDDIR)/dns_sd.h |
51 | +${DESTDIR}/$(INSTBASE)/include/dns_sd.h: $(SHAREDDIR)/dns_sd.h |
52 | $(CP) $< $@ |
53 | |
54 | -$(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME): mdnsd.sh $(STARTUPSCRIPTDIR) |
55 | +${DESTDIR}/$(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME): mdnsd.sh $(STARTUPSCRIPTDIR) |
56 | $(CP) $< $@ |
57 | chmod ugo+x $@ |
58 | ifdef RUNLEVELSCRIPTSDIR |
59 | @@ -463,31 +459,26 @@ |
60 | endif |
61 | endif |
62 | |
63 | -$(NSSINSTPATH)/$(NSSLINKNAME): $(NSSINSTPATH)/$(NSSLIBFILE) |
64 | +${DESTDIR}/$(NSSINSTPATH)/$(NSSLINKNAME): ${DESTDIR}/$(NSSINSTPATH)/$(NSSLIBFILE) |
65 | $(LN) $< $@ |
66 | - ldconfig |
67 | |
68 | -$(NSSINSTPATH)/$(NSSLIBFILE): $(BUILDDIR)/$(NSSLIBFILE) |
69 | +${DESTDIR}/$(NSSINSTPATH)/$(NSSLIBFILE): $(BUILDDIR)/$(NSSLIBFILE) |
70 | $(CP) $< $@ |
71 | chmod 444 $@ |
72 | |
73 | -/etc/nss_mdns.conf: nss_mdns.conf |
74 | +${DESTDIR}/etc/nss_mdns.conf: nss_mdns.conf |
75 | $(CP) $< $@ |
76 | chmod 444 $@ |
77 | - # Check the nsswitch.conf file. |
78 | - # If 'mdns' does not already appear on the "hosts:" line, then add it right before 'dns' |
79 | - cp -f /etc/nsswitch.conf /etc/nsswitch.conf.pre-mdns |
80 | - sed -e '/mdns/!s/^\(hosts:.*\)dns\(.*\)/\1mdns dns\2/' /etc/nsswitch.conf.pre-mdns > /etc/nsswitch.conf |
81 | |
82 | -$(MANPATH)/man5/%.5: %.5 |
83 | +${DESTDIR}/$(MANPATH)/man5/%.5: %.5 |
84 | cp $< $@ |
85 | chmod 444 $@ |
86 | |
87 | -$(MANPATH)/man8/%.8: %.8 |
88 | +${DESTDIR}/$(MANPATH)/man8/%.8: %.8 |
89 | cp $< $@ |
90 | chmod 444 $@ |
91 | |
92 | -$(MANPATH)/man8/mdnsd.8: $(SHAREDDIR)/mDNSResponder.8 |
93 | +${DESTDIR}/$(MANPATH)/man8/mdnsd.8: $(SHAREDDIR)/mDNSResponder.8 |
94 | cp $< $@ |
95 | chmod 444 $@ |
96 |