123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051 |
- $OpenBSD: patch-Rakefile,v 1.7 2014/07/09 08:31:51 jasper Exp $
- - Change various configuration variables to what they would be like when
- PuppetDB has been _installed_, as these variables are used in other scripts.
- The installer has been modified in tasks/install.rake
- - Set OpenBSD's Ruby site dir.
- --- Rakefile.orig Mon Jul 7 19:37:05 2014
- +++ Rakefile Wed Jul 9 10:20:57 2014
- @@ -85,24 +85,24 @@ else
- else
- "/usr/share/puppetdb"
- end
- - @etc_dir = "/etc/puppetdb"
- - @config_dir = "/etc/puppetdb/conf.d"
- - @lib_dir = "/var/lib/puppetdb"
- + @etc_dir = "${SYSCONFDIR}/puppetdb"
- + @config_dir = "${SYSCONFDIR}/puppetdb/conf.d"
- + @lib_dir = "${VARBASE}/db//puppetdb"
- @libexec_dir = case @osfamily
- when /openbsd/
- - "/usr/local/libexec/puppetdb"
- + "${PREFIX}/libexec/puppetdb"
- when /redhat/, /suse/, /darwin/, /bsd/
- "/usr/libexec/puppetdb"
- else
- "/usr/lib/puppetdb"
- end
- - @link = "/usr/share/puppetdb"
- - @name = "puppetdb"
- + @link = "share/puppetdb"
- + @name = "_puppetdb"
- @sbin_dir = case @osfamily
- when /archlinux/
- "/usr/bin"
- else
- - "/usr/sbin"
- + "sbin"
- end
- end
-
- @@ -128,7 +128,7 @@ case @osfamily
- when /suse/
- @plibdir = @pe ? PE_SITELIBDIR : (%x(ruby -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']").chomp)
- when /openbsd/
- - @plibdir = @pe ? PE_SITELIBDIR : '/usr/local/lib/ruby/site_ruby/1.9.1'
- + @plibdir = @pe ? PE_SITELIBDIR : '${MODRUBY_SITEDIR}'
- when /archlinux/
- @plibdir = @pe ? PE_SITELIBDIR : (%x(ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendorlibdir"]').chomp)
- end
|