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

diff --git a/.cvsignore b/.cvsignore
index f2464d45ebca32539fbc88e6894187438182e63a..44de11e9dd6b4f86c0c4091239059e86e8037c5f 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -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 5e117a5d9435d5c064005981aab8c4d86380b1a5..760d8e79f73bb3503e1b1e09b16bc40b0115da3f 100644 (file)
--- 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)