Merge pull request #208 from mackerelio/revert-205-revert-201-use-usr…

…-bin Revert "Revert "use /usr/bin/mackerel-plugin-*""
mackerelio · Mar 28, 2016 · 36155b3 · 36155b3
2 parents 8240e88 + a57ef91
commit 36155b3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/packaging/deb/debian/rules b/packaging/deb/debian/rules
@@ -7,9 +7,14 @@ package=mackerel-agent-plugins
 
 override_dh_auto_install:
 	dh_auto_install
-	install -d -m 755 debian/tmp/usr/local/bin
+	install -d -m 755 debian/tmp/usr/bin
 	for i in apache2 aws-ec2-cpucredit aws-elasticache aws-elasticsearch aws-elb aws-rds aws-ses conntrack elasticsearch gostats haproxy jmx-jolokia jvm linux mailq memcached mongodb munin mysql nginx php-apc php-opcache plack postgres rabbitmq redis snmp squid td-table-count trafficserver varnish xentop aws-cloudfront aws-ec2-ebs fluentd docker unicorn uptime inode;do \
-	    install -m755 debian/mackerel-plugin-$$i debian/tmp/usr/local/bin; \
+	    install -m755 debian/mackerel-plugin-$$i debian/tmp/usr/bin; \
+	done
+	install -d -m 755 debian/tmp/usr/local/bin
+	for i in apache2 aws-ec2-cpucredit aws-elasticache aws-elasticsearch aws-elb aws-rds aws-ses conntrack elasticsearch gostats haproxy jmx-jolokia jvm linux mailq memcached mongodb munin mysql nginx php-apc php-opcache plack postgres rabbitmq redis snmp squid td-table-count trafficserver varnish xentop aws-cloudfront aws-ec2-ebs fluentd docker unicorn uptime inode; \
+	do \
+	    ln -s ../../bin/mackerel-plugin-$$i debian/tmp/usr/local/bin/mackerel-plugin-$$i; \
 	done
 
 override_dh_usrlocal:

diff --git a/packaging/rpm/mackerel-agent-plugins.spec b/packaging/rpm/mackerel-agent-plugins.spec
@@ -4,7 +4,8 @@
 
 %define __buildroot %{_builddir}/%{name}
 #%define __targetdir %{_libexecdir}/mackerel/plugins
-%define __targetdir /usr/local/bin
+%define __targetdir /usr/bin
+%define __oldtargetdir /usr/local/bin
 
 Summary: Monitoring program plugins for Mackerel
 Name: mackerel-agent-plugins
@@ -33,12 +34,19 @@ for i in apache2 aws-ec2-cpucredit aws-elasticache aws-elasticsearch aws-elb aws
     %{__install} -m0755 %{_sourcedir}/build/mackerel-plugin-$i %{buildroot}%{__targetdir}/; \
 done
 
+%{__install} -d -m755 %{buildroot}%{__oldtargetdir}
+for i in apache2 aws-ec2-cpucredit aws-elasticache aws-elasticsearch aws-elb aws-rds aws-ses conntrack elasticsearch gostats haproxy jmx-jolokia jvm linux mailq memcached mongodb munin mysql nginx php-apc php-opcache plack postgres rabbitmq redis snmp squid td-table-count trafficserver varnish xentop aws-cloudfront aws-ec2-ebs fluentd docker unicorn uptime inode; \
+do \
+    ln -s ../../bin/mackerel-plugin-$i %{buildroot}%{__oldtargetdir}/mackerel-plugin-$i; \
+done
+
 %clean
 %{__rm} -rf %{buildroot}
 
 %files
 %defattr(-, root, root, 0755)
 %{__targetdir}
+%{__oldtargetdir}
 
 %changelog
 * Fri Mar 25 2016 <y.songmu@gmail.com> - 0.19.2