From 64a3a4eb5edf205f9ffcfc586cae9ad5b750a3f9 Mon Sep 17 00:00:00 2001 From: Songmu Date: Fri, 25 Mar 2016 12:08:33 +0900 Subject: [PATCH] Revert "use /usr/bin/check-*" --- packaging/deb/debian/rules | 9 ++------- packaging/rpm/mackerel-check-plugins.spec | 10 +--------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/packaging/deb/debian/rules b/packaging/deb/debian/rules index 12adf2a7..f9fd1261 100755 --- a/packaging/deb/debian/rules +++ b/packaging/deb/debian/rules @@ -7,14 +7,9 @@ package=mackerel-check-plugins override_dh_auto_install: dh_auto_install - install -d -m 755 debian/tmp/usr/bin - for i in elasticsearch file-age file-size http jmx-jolokia load log mailq memcached mysql ntpoffset postgresql procs redis solr tcp uptime;do \ - install -m755 debian/check-$$i debian/tmp/usr/bin; \ - done install -d -m 755 debian/tmp/usr/local/bin - for i in elasticsearch file-age file-size http jmx-jolokia load log mailq memcached mysql ntpoffset postgresql procs redis solr tcp uptime; \ - do \ - ln -s ../../bin/check-$$i debian/tmp/usr/local/bin/check-$$i; \ + for i in elasticsearch file-age file-size http jmx-jolokia load log mailq memcached mysql ntpoffset postgresql procs redis solr tcp uptime;do \ + install -m755 debian/check-$$i debian/tmp/usr/local/bin; \ done override_dh_usrlocal: diff --git a/packaging/rpm/mackerel-check-plugins.spec b/packaging/rpm/mackerel-check-plugins.spec index 610af4e7..bfbb0072 100644 --- a/packaging/rpm/mackerel-check-plugins.spec +++ b/packaging/rpm/mackerel-check-plugins.spec @@ -1,7 +1,6 @@ %define _binaries_in_noarch_packages_terminate_build 0 %define _localbindir /usr/local/bin -%define __targetdir /usr/bin -%define __oldtargetdir /usr/local/bin +%define __targetdir /usr/local/bin Name: mackerel-check-plugins Version: 0.5.1 @@ -30,19 +29,12 @@ for i in elasticsearch file-age file-size http jmx-jolokia load log mailq memcac %{__install} -m0755 %{_sourcedir}/build/check-$i %{buildroot}%{__targetdir}/; \ done -%{__install} -d -m755 %{buildroot}%{__oldtargetdir} -for i in elasticsearch file-age file-size http jmx-jolokia load log mailq memcached mysql ntpoffset postgresql procs redis solr tcp uptime; \ -do \ - ln -s ../../bin/check-$i %{buildroot}%{__oldtargetdir}/check-$i; \ -done - %clean %{__rm} -rf %{buildroot} %files %defattr(-, root, root, 0755) %{__targetdir} -%{__oldtargetdir} %changelog * Fri Mar 25 2016 - 0.5.1