Explorar o código

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

Jeremy T. Bouse %!s(int64=23) %!d(string=hai) anos
pai
achega
a0d3b87337
Modificáronse 2 ficheiros con 3 adicións e 2 borrados
  1. 1 1
      .cvsignore
  2. 2 1
      Makefile.am

+ 1 - 1
.cvsignore

@@ -9,7 +9,7 @@ command.cfg
 Cache.pm
 build-*
 aclocal.m4
-autom4te-*.cache
+autom4te*.cache
 install-sh
 mkinstalldirs
 missing

+ 2 - 1
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)