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 Cache.pm build-* aclocal.m4 -autom4te-*.cache +autom4te*.cache install-sh mkinstalldirs 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 BUILDDIR := $(shell pwd)/build-solaris PACKDIR := $(shell pwd)/build-pkg PKGSCRIPT := $(shell pwd)/pkg/solaris/solpkg +PKGPFX := $(shell echo ${prefix} |sed -e 's@^/usr/local@@') VERSION=@PACKAGE_VERSION@ solpkg: if [ ! -d $(BUILDDIR) ] ; then mkdir $(BUILDDIR); fi if [ ! -d $(PACKDIR) ] ; then mkdir $(PACKDIR); fi $(MAKE) all - $(MAKE) DESTDIR=$(BUILDDIR) prefix=/ install + $(MAKE) DESTDIR=$(BUILDDIR) prefix=$(PKGPFX) install $(INSTALL) pkg/solaris/pkginfo $(BUILDDIR) cd $(BUILDDIR) && $(PERL) $(PKGSCRIPT) $(PACKDIR) |