summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2013-01-22 18:03:11 +0100
committerAlexander Sulfrian <alexander@sulfrian.net>2013-01-23 13:57:15 +0100
commitb1fe3486c98c6be7e869c6b0cbf81a6d8c749be9 (patch)
tree72c8876f0d07a23919eaff5b3581d0f073ef2050
parentc8e4cb5dffd75c5e9588469a423372ddc4f4c696 (diff)
downloadvserver-monitoring-b1fe3486c98c6be7e869c6b0cbf81a6d8c749be9.tar.gz
vserver-monitoring-b1fe3486c98c6be7e869c6b0cbf81a6d8c749be9.tar.bz2
vserver-monitoring-b1fe3486c98c6be7e869c6b0cbf81a6d8c749be9.zip
Makefile: install with /usr/ prefix into vserver subdir1.3
-rw-r--r--Makefile6
-rwxr-xr-xcheck_load2
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index e9d3b76..d05e6fe 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-DESTDIR?=/usr/local
+PREFIX?=/usr
UPSTREAM=master
VERSION=$(shell git describe --tags $(UPSTREAM))
@@ -7,8 +7,8 @@ all:
clean:
install: check_load
- install -d "$(DESTDIR)/lib/nagios/plugins/"
- install $? "$(DESTDIR)/lib/nagios/plugins/"
+ install -d "$(DESTDIR)$(PREFIX)/lib/nagios/plugins/vserver/"
+ install $? "$(DESTDIR)$(PREFIX)/lib/nagios/plugins/vserver/"
dist:
git archive "$(UPSTREAM)" | gzip > "../vserver-monitoring_$(VERSION).orig.tar.gz"
diff --git a/check_load b/check_load
index 6ef76fb..1690872 100755
--- a/check_load
+++ b/check_load
@@ -6,7 +6,7 @@ use warnings;
use VServer;
use Nagios::Plugin;
-our $VERSION = '1.2';
+our $VERSION = '1.3';
sub init_nagios_plugin() {
my $plugin = Nagios::Plugin->new(