[Nagiosplug-checkins] CVS: nagiosplug .cvsignore,1.5,1.6 Makefile.am,1.15,1.16

[Jeremy T. Bouse]

Update of /cvsroot/nagiosplug/nagiosplug
In directory sc8-pr-cvs1:/tmp/cvs-serv9783

Modified Files:
	.cvsignore Makefile.am 
Log Message:
Better stripping of prefix for Solaris package install needs to remove
	/usr/local as package installs there by default


Index: .cvsignore
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** .cvsignore	13 Mar 2003 22:20:26 -0000	1.5
--- .cvsignore	24 Mar 2003 19:05:13 -0000	1.6
***************
*** 10,14 ****
  build-*
  aclocal.m4
! autom4te-*.cache
  install-sh
  mkinstalldirs
--- 10,14 ----
  build-*
  aclocal.m4
! autom4te*.cache
  install-sh
  mkinstalldirs

Index: Makefile.am
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** Makefile.am	24 Mar 2003 17:44:59 -0000	1.15
--- Makefile.am	24 Mar 2003 19:05:14 -0000	1.16
***************
*** 22,25 ****
--- 22,26 ----
  PACKDIR := $(shell pwd)/build-pkg
  PKGSCRIPT := $(shell pwd)/pkg/solaris/solpkg
+ PKGPFX := $(shell echo ${prefix} |sed -e 's@^/usr/local@@')
  VERSION=@PACKAGE_VERSION@
  
***************
*** 28,32 ****
  	if [ ! -d $(PACKDIR) ] ; then mkdir $(PACKDIR); fi
  	$(MAKE) all
! 	$(MAKE) DESTDIR=$(BUILDDIR) prefix=/ install
  	$(INSTALL) pkg/solaris/pkginfo $(BUILDDIR)
  	cd $(BUILDDIR) && $(PERL) $(PKGSCRIPT) $(PACKDIR)
--- 29,33 ----
  	if [ ! -d $(PACKDIR) ] ; then mkdir $(PACKDIR); fi
  	$(MAKE) all
! 	$(MAKE) DESTDIR=$(BUILDDIR) prefix=$(PKGPFX) install
  	$(INSTALL) pkg/solaris/pkginfo $(BUILDDIR)
  	cd $(BUILDDIR) && $(PERL) $(PKGSCRIPT) $(PACKDIR)