diff options
| author |   Tobias Scherbaum <dertobi123@gentoo.org> | 2008-03-31 18:31:23 +0000 |
|---|---|---|
| committer | Tobias Scherbaum <dertobi123@gentoo.org> | 2008-03-31 18:31:23 +0000 |
| commit | 9dc19ac08509613ac6bb828159a0e3d879ea28a8 (patch) | |
| tree | 1609cd815efa9ac175d8531d10a472081095ba38 | |
| parent | Add libexecdir, patch by Wolfram Schlich #215605 (diff) | |
| download | dertobi123-9dc19ac08509613ac6bb828159a0e3d879ea28a8.tar.gz dertobi123-9dc19ac08509613ac6bb828159a0e3d879ea28a8.tar.bz2 dertobi123-9dc19ac08509613ac6bb828159a0e3d879ea28a8.zip | |
use get_libdir, patch by Wolfram Schlich #215604
svn path=/; revision=33
| -rw-r--r-- | net-analyzer/nagios-plugins/Manifest | 2 | ||||
| -rw-r--r-- | net-analyzer/nagios-plugins/nagios-plugins-1.4.11-r101.ebuild (renamed from net-analyzer/nagios-plugins/nagios-plugins-1.4.11-r100.ebuild) | 19 |
2 files changed, 12 insertions, 9 deletions
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest index 3265db1..8f18243 100644 --- a/net-analyzer/nagios-plugins/Manifest +++ b/net-analyzer/nagios-plugins/Manifest @@ -1,4 +1,4 @@ AUX nagios-plugins-1.4.10-contrib.patch 1610 RMD160 928e2ce0a8071b5fd93ca28722512d8996eaa027 SHA1 ff7105763268fc3cc48dced7c17df9ff0bb84899 SHA256 d7aa2d6e420438ae5e5e687bd61bd5ff1ca5aebb763e3b692238db23f24d7278 AUX nagios-plugins-1.4.10-noradius.patch 1029 RMD160 e1e449d93966d822eca21782968e24fce4547a95 SHA1 e5e6758790cc85db9f028cde3fb3d6611356167e SHA256 bff601e67a413abd84c2b430bfcf10395f68a83f98a628a398ee50f7cb406229 DIST nagios-plugins-1.4.11.tar.gz 1734230 RMD160 4f33e796f8eac2d8d13cbecbcc1191857e1b5f15 SHA1 bc91a57ad6f5468b17f24429ba25225cfff45d59 SHA256 2cc1534a7f41da6cdb72d595c8643e62491fbab1bb768ab113eff20581ac05e5 -EBUILD nagios-plugins-1.4.11-r100.ebuild 3547 RMD160 e89cf13cbaec1944ad169761a76ebfe3e65be17d SHA1 57a2b23f0c3cd0bc9ee92a3e0ad0c6843817d66b SHA256 03d71766b4037ec21a79a4fe71f2dd9adda23fe9f61d031374ab4a54e3474e10 +EBUILD nagios-plugins-1.4.11-r101.ebuild 3673 RMD160 b93ae3b88f35a13188e43a98f475916a3f6e6e92 SHA1 73478e75bfaeb3a40bbe2f07192ccdc2349ce535 SHA256 c8608995879e96859964221e5196c3784811269c8d06f09d934eea609d37ce6c diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.11-r100.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.11-r101.ebuild index 5f5e360..891cd67 100644 --- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.11-r100.ebuild +++ b/net-analyzer/nagios-plugins/nagios-plugins-1.4.11-r101.ebuild @@ -75,7 +75,7 @@ src_compile() { ${conf} \ --host=${CHOST} \ --prefix=/usr \ - --libexecdir=/usr/lib/nagios/plugins \ + --libexecdir=/usr/$(get_libdir)/nagios/plugins \ --sysconfdir=/etc/nagios || die "econf failed" # fix problem with additional - @@ -98,18 +98,21 @@ src_install() { emake DESTDIR="${D}" install || die "make install failed" if use mysql || use postgres; then - dodir /usr/lib/nagios/plugins - exeinto /usr/lib/nagios/plugins + dodir /usr/$(get_libdir)/nagios/plugins + exeinto /usr/$(get_libdir)/nagios/plugins doexe "${S}"/contrib/check_nagios_db.pl fi - mv "${S}"/contrib "${D}"/usr/lib/nagios/plugins/contrib + mv "${S}"/contrib "${D}"/usr/$(get_libdir)/nagios/plugins/contrib - chown -R root:nagios "${D}"/usr/lib/nagios/plugins || die "Failed Chown of ${D}usr/lib/nagios/plugins" + chown -R root:nagios "${D}"/usr/$(get_libdir)/nagios/plugins \ + || die "Failed chown of ${D}usr/$(get_libdir)/nagios/plugins" - chmod -R o-rwx "${D}"/usr/lib/nagios/plugins || die "Failed Chmod of ${D}usr/lib/nagios/plugins" + chmod -R o-rwx "${D}"/usr/$(get_libdir)/nagios/plugins \ + || die "Failed chmod of ${D}usr/$(get_libdir)/nagios/plugins" - chmod 04710 "${D}"/usr/lib/nagios/plugins/check_icmp || die "Failed Chmod of ${D}usr/lib/nagios/plugins/check_icmp" + chmod 04710 "${D}"/usr/$(get_libdir)/nagios/plugins/check_icmp \ + || die "Failed chmod of ${D}usr/$(get_libdir)/nagios/plugins/check_icmp" } @@ -118,5 +121,5 @@ pkg_postinst() { einfo "Depending on what you want to monitor with nagios, some or all of these USE" einfo "flags need to be set for nagios to function correctly." echo - einfo "contrib plugins are installed into /usr/nagios/libexec/contrib" + einfo "contrib plugins are installed into /usr/$(get_libdir)/nagios/plugins/contrib" } |