--- work/mDNSResponder-107/mDNSPosix/Makefile 2004-12-15 22:58:41.000000000 +0100 +++ tmp/mDNSResponder-107/mDNSPosix/Makefile 2005-02-09 12:31:12.664835888 +0100 @@ -303,7 +303,7 @@ NSSVERSION := 0.2 NSSLIBFILE := $(NSSLIBNAME)-$(NSSVERSION).so NSSLINKNAME := $(NSSLIBNAME).so.2 -NSSINSTPATH := /lib +NSSINSTPATH := $(INSTBASE)/lib # If not otherwise defined, we install into /usr/lib and /usr/include # and our startup script is called mdns (e.g. /etc/init.d/mdns) @@ -319,11 +319,11 @@ endif # If directory /usr/share/man exists, then we install man pages into that, else /usr/man -ifeq ($(wildcard /usr/share/man), /usr/share/man) -MANPATH := /usr/share/man -else -MANPATH := /usr/man -endif +#ifeq ($(wildcard /usr/share/man), /usr/share/man) +#MANPATH := $(INSTBASE)/usr/share/man +#else +MANPATH := $(INSTBASE)/man +#endif # If directories /etc/init.d/rc*.d exist, then we install into that (Suse) ifeq ($(wildcard /etc/init.d/rc2.d/), /etc/init.d/rc2.d/) @@ -352,7 +352,7 @@ all: setup Daemon libdns_sd Client Responder ProxyResponder Identify NetMonitor dnsextd $(OPTIONALTARG) -install: setup InstalledDaemon InstalledLib InstalledStartup InstalledManPages $(OPTINSTALL) +install: setup InstalledDaemon InstalledLib InstalledManPages $(OPTINSTALL) # 'setup' sets up the build directory structure the way we want setup: @@ -410,7 +410,7 @@ InstalledStartup: $(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME) @echo $+ " installed" -InstalledNSS: $(NSSINSTPATH)/$(NSSLINKNAME) /etc/nss_mdns.conf $(MANPATH)/man5/nss_mdns.conf.5 $(MANPATH)/man8/libnss_mdns.8 +InstalledNSS: $(NSSINSTPATH)/$(NSSLINKNAME) $(INSTBASE)/etc/nss_mdns.conf $(MANPATH)/man5/nss_mdns.conf.5 $(MANPATH)/man8/libnss_mdns.8 @echo $+ " installed" InstalledManPages: $(MANPATH)/man8/mdnsd.8 @@ -448,31 +448,33 @@ $(NSSINSTPATH)/$(NSSLINKNAME): $(NSSINSTPATH)/$(NSSLIBFILE) $(LN) $< $@ - ldconfig +ifdef LDCONFIG + $(LDCONFIG) +endif $(NSSINSTPATH)/$(NSSLIBFILE): $(BUILDDIR)/$(NSSLIBFILE) $(CP) $< $@ - chmod 444 $@ + chmod 644 $@ -/etc/nss_mdns.conf: nss_mdns.conf +$(INSTBASE)/etc/nss_mdns.conf: nss_mdns.conf $(CP) $< $@ - chmod 444 $@ + chmod 644 $@ # Check the nsswitch.conf file. # If 'mdns' does not already appear on the "hosts:" line, then add it right before 'dns' - cp -f /etc/nsswitch.conf /etc/nsswitch.conf.pre-mdns - sed -e '/mdns/!s/^\(hosts:.*\)dns\(.*\)/\1mdns dns\2/' /etc/nsswitch.conf.pre-mdns > /etc/nsswitch.conf + cp -f /etc/nsswitch.conf $(INSTBASE)/etc/nsswitch.conf.pre-mdns + sed -e '/mdns/!s/^\(hosts:.*\)dns\(.*\)/\1mdns dns\2/' $(INSTBASE)/etc/nsswitch.conf.pre-mdns > $(INSTBASE)/etc/nsswitch.conf $(MANPATH)/man5/%.5: %.5 cp $< $@ - chmod 444 $@ + chmod 644 $@ $(MANPATH)/man8/%.8: %.8 cp $< $@ - chmod 444 $@ + chmod 644 $@ $(MANPATH)/man8/mdnsd.8: $(SHAREDDIR)/mDNSResponder.8 cp $< $@ - chmod 444 $@ + chmod 644 $@ #############################################################################