$NetBSD: patch-aa,v 1.1.1.1 2006/01/29 10:00:07 seb Exp $ --- installer.rb.orig 2004-09-08 12:14:43.000000000 +0000 +++ installer.rb @@ -71,6 +71,7 @@ class Installer ENV['BINDIR' ] ||= "#{ENV['PREFIX']}/bin" ENV['MANDIR' ] ||= "#{ENV['PREFIX']}/man" ENV['DOCDIR' ] ||= "#{ENV['PREFIX']}/share/doc" + ENV['EGDIR' ] ||= "#{ENV['PREFIX']}/share/examples" ENV['ETCDIR' ] ||= "#{ENV['PREFIX']}/etc" ENV['CGIDIR' ] ||= "#{ENV['LIBEXEC']}/#{ENV['PROGNAME']}/cgi-bin" ENV['WWWDIR' ] ||= "#{ENV['LIBEXEC']}/#{ENV['PROGNAME']}/www" @@ -79,11 +80,13 @@ class Installer # Create some shortcut for later @installdir = "#{ENV['LIBEXEC']}/#{ENV['PROGNAME']}" + @egdir = "#{ENV['EGDIR']}/#{ENV['PROGNAME']}#{ENV['ETCDIST']}" @confdir = "#{ENV['ETCDIR']}/#{ENV['PROGNAME']}#{ENV['ETCDIST']}" @dnsdoctor = "#{@installdir}/dnsdoctor/zc.rb" @wwwdir = "#{ENV['WWWDIR']}" @ch_installdir = "#{ENV['CHROOT']}#{@installdir}" + @ch_egdir = "#{ENV['CHROOT']}#{@egdir}" @ch_confdir = "#{ENV['CHROOT']}#{@confdir}" @ch_dnsdoctor = "#{ENV['CHROOT']}#{@dnsdoctor}" @ch_wwwdir = "#{ENV['CHROOT']}#{@wwwdir}" @@ -181,10 +184,10 @@ class Installer puts puts "==> Installing default configuration file" - mkdir_p @ch_confdir, :verbose => @verbose - cp 'etc/dnsdoctor/dnsdoctor.conf', @ch_confdir, :verbose => @verbose - cp 'etc/dnsdoctor/rootservers', @ch_confdir, :verbose => @verbose - cp Dir['etc/dnsdoctor/*.profile'], @ch_confdir, :verbose => @verbose + mkdir_p @ch_egdir, :verbose => @verbose + cp 'etc/dnsdoctor/dnsdoctor.conf', @ch_egdir, :verbose => @verbose + cp 'etc/dnsdoctor/rootservers', @ch_egdir, :verbose => @verbose + cp Dir['etc/dnsdoctor/*.profile'], @ch_egdir, :verbose => @verbose puts end @@ -217,6 +220,7 @@ class Installer puts "==> Installing HTML pages" mkdir_p @ch_wwwdir, :verbose => @verbose Dir["www/*"].each { |entry| + next if entry =~ /dnsdoctor.conf.*/ cp_r entry, @ch_wwwdir, :verbose => @verbose } puts