[Nagiosplug-checkins] CVS: nagiosplug Makefile.am,1.14,1.15

[Jeremy T. Bouse]

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

Modified Files:
	Makefile.am 
Log Message:
Minor changes to build for Solaris packages


Index: Makefile.am
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** Makefile.am	23 Mar 2003 07:01:19 -0000	1.14
--- Makefile.am	24 Mar 2003 17:44:59 -0000	1.15
***************
*** 19,24 ****
  
  # Solaris pkgmk
! BUILDDIR=`pwd`/build-solaris
! PACKDIR=`pwd`/build-pkg
  VERSION=@PACKAGE_VERSION@
  
--- 19,25 ----
  
  # Solaris pkgmk
! BUILDDIR := $(shell pwd)/build-solaris
! PACKDIR := $(shell pwd)/build-pkg
! PKGSCRIPT := $(shell pwd)/pkg/solaris/solpkg
  VERSION=@PACKAGE_VERSION@
  
***************
*** 27,33 ****
  	if [ ! -d $(PACKDIR) ] ; then mkdir $(PACKDIR); fi
  	$(MAKE) all
! 	$(MAKE) DESTDIR=$(BUILDDIR) install
  	$(INSTALL) pkg/solaris/pkginfo $(BUILDDIR)
! 	$(cd $(BUILDDIR) && `pwd`/pkg/solaris/solpkg $(PACKDIR))
  
  pkgclean:
--- 28,34 ----
  	if [ ! -d $(PACKDIR) ] ; then mkdir $(PACKDIR); fi
  	$(MAKE) all
! 	$(MAKE) DESTDIR=$(BUILDDIR) prefix=/ install
  	$(INSTALL) pkg/solaris/pkginfo $(BUILDDIR)
! 	cd $(BUILDDIR) && $(PERL) $(PKGSCRIPT) $(PACKDIR)
  
  pkgclean: