diff options
author | Jeremy T. Bouse <undrgrid@users.sourceforge.net> | 2003-03-24 19:05:14 +0000 |
---|---|---|
committer | Jeremy T. Bouse <undrgrid@users.sourceforge.net> | 2003-03-24 19:05:14 +0000 |
commit | a0d3b873372f6511caf86a57b8d31e9aeb762388 (patch) | |
tree | fd9ad478831e76fecf4acaf44dd33a0d69b3b2ff | |
parent | ed1fda6bd9f8983d809ff5afbdc64cdca6030b2d (diff) | |
download | monitoring-plugins-a0d3b873372f6511caf86a57b8d31e9aeb762388.tar.gz |
Better stripping of prefix for Solaris package install needs to remove
/usr/local as package installs there by default
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@460 f882894a-f735-0410-b71e-b25c423dba1c
-rw-r--r-- | .cvsignore | 2 | ||||
-rw-r--r-- | Makefile.am | 3 |
2 files changed, 3 insertions, 2 deletions
@@ -9,7 +9,7 @@ command.cfg | |||
9 | Cache.pm | 9 | Cache.pm |
10 | build-* | 10 | build-* |
11 | aclocal.m4 | 11 | aclocal.m4 |
12 | autom4te-*.cache | 12 | autom4te*.cache |
13 | install-sh | 13 | install-sh |
14 | mkinstalldirs | 14 | mkinstalldirs |
15 | missing | 15 | missing |
diff --git a/Makefile.am b/Makefile.am index 5e117a5d..760d8e79 100644 --- a/Makefile.am +++ b/Makefile.am | |||
@@ -21,13 +21,14 @@ nagios-plugins.spec: nagios-plugins.spec.in | |||
21 | BUILDDIR := $(shell pwd)/build-solaris | 21 | BUILDDIR := $(shell pwd)/build-solaris |
22 | PACKDIR := $(shell pwd)/build-pkg | 22 | PACKDIR := $(shell pwd)/build-pkg |
23 | PKGSCRIPT := $(shell pwd)/pkg/solaris/solpkg | 23 | PKGSCRIPT := $(shell pwd)/pkg/solaris/solpkg |
24 | PKGPFX := $(shell echo ${prefix} |sed -e 's@^/usr/local@@') | ||
24 | VERSION=@PACKAGE_VERSION@ | 25 | VERSION=@PACKAGE_VERSION@ |
25 | 26 | ||
26 | solpkg: | 27 | solpkg: |
27 | if [ ! -d $(BUILDDIR) ] ; then mkdir $(BUILDDIR); fi | 28 | if [ ! -d $(BUILDDIR) ] ; then mkdir $(BUILDDIR); fi |
28 | if [ ! -d $(PACKDIR) ] ; then mkdir $(PACKDIR); fi | 29 | if [ ! -d $(PACKDIR) ] ; then mkdir $(PACKDIR); fi |
29 | $(MAKE) all | 30 | $(MAKE) all |
30 | $(MAKE) DESTDIR=$(BUILDDIR) prefix=/ install | 31 | $(MAKE) DESTDIR=$(BUILDDIR) prefix=$(PKGPFX) install |
31 | $(INSTALL) pkg/solaris/pkginfo $(BUILDDIR) | 32 | $(INSTALL) pkg/solaris/pkginfo $(BUILDDIR) |
32 | cd $(BUILDDIR) && $(PERL) $(PKGSCRIPT) $(PACKDIR) | 33 | cd $(BUILDDIR) && $(PERL) $(PKGSCRIPT) $(PACKDIR) |
33 | 34 | ||