diff options
| author | Ruben Kerkhof <ruben@rubenkerkhof.com> | 2013-04-27 17:50:13 +0200 |
|---|---|---|
| committer | Ruben Kerkhof <ruben@rubenkerkhof.com> | 2013-04-27 17:50:13 +0200 |
| commit | e3c6ace6e42dedba5f4bca974854b607c14224b7 (patch) | |
| tree | 9b3459f98066b1dfe18786b8d94681faf29b94d5 | |
| parent | 41d3e5c62b8615c643d440157856ed992b94470e (diff) | |
| download | collectd-e3c6ace6e42dedba5f4bca974854b607c14224b7.tar.gz collectd-e3c6ace6e42dedba5f4bca974854b607c14224b7.tar.xz collectd-e3c6ace6e42dedba5f4bca974854b607c14224b7.zip | |
Replace some hardcoded paths with macros
| -rw-r--r-- | collectd.spec | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/collectd.spec b/collectd.spec index 282eee5..c27a680 100644 --- a/collectd.spec +++ b/collectd.spec @@ -355,13 +355,13 @@ mkdir perl-examples find contrib -name '*.p[lm]' -exec mv {} perl-examples/ \; # Move config contribs -mkdir -p %{buildroot}/etc/collectd.d/ -cp %{SOURCE91} %{buildroot}/etc/collectd.d/apache.conf -cp %{SOURCE92} %{buildroot}/etc/collectd.d/email.conf -cp %{SOURCE93} %{buildroot}/etc/collectd.d/mysql.conf -cp %{SOURCE94} %{buildroot}/etc/collectd.d/nginx.conf -cp %{SOURCE95} %{buildroot}/etc/collectd.d/sensors.conf -cp %{SOURCE96} %{buildroot}/etc/collectd.d/snmp.conf +mkdir -p %{buildroot}%{_sysconfdir}/collectd.d/ +cp %{SOURCE91} %{buildroot}%{_sysconfdir}/collectd.d/apache.conf +cp %{SOURCE92} %{buildroot}%{_sysconfdir}/collectd.d/email.conf +cp %{SOURCE93} %{buildroot}%{_sysconfdir}/collectd.d/mysql.conf +cp %{SOURCE94} %{buildroot}%{_sysconfdir}/collectd.d/nginx.conf +cp %{SOURCE95} %{buildroot}%{_sysconfdir}/collectd.d/sensors.conf +cp %{SOURCE96} %{buildroot}%{_sysconfdir}/collectd.d/snmp.conf # configs for subpackaged plugins %ifnarch s390 s390x @@ -370,11 +370,11 @@ for p in dns ipmi libvirt nut perl ping postgresql rrdtool for p in dns ipmi libvirt perl ping postgresql rrdtool %endif do -%{__cat} > %{buildroot}/etc/collectd.d/$p.conf <<EOF +%{__cat} > %{buildroot}%{_sysconfdir}/collectd.d/$p.conf <<EOF LoadPlugin $p EOF done -%{__cat} >> %{buildroot}/etc/collectd.d/rrdtool.conf <<EOF +%{__cat} >> %{buildroot}%{_sysconfdir}/collectd.d/rrdtool.conf <<EOF <Plugin rrdtool> DataDir "/var/lib/collectd/rrd" CacheTimeout 120 |