From a0d3b873372f6511caf86a57b8d31e9aeb762388 Mon Sep 17 00:00:00 2001 From: "Jeremy T. Bouse" Date: Mon, 24 Mar 2003 19:05:14 +0000 Subject: [PATCH] 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 --- .cvsignore | 2 +- Makefile.am | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index f2464d4..44de11e 100644 --- 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 5e117a5..760d8e7 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) -- 2.30.2