[Nagiosplug-checkins] CVS: nagiosplug Makefile.am,1.16,1.17

Ton Voon tonvoon at users.sourceforge.net
Wed May 14 14:40:12 CEST 2003


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

Modified Files:
	Makefile.am 
Log Message:
Remove dependency on gnu make


Index: Makefile.am
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** Makefile.am	24 Mar 2003 19:05:14 -0000	1.16
--- Makefile.am	14 May 2003 21:39:48 -0000	1.17
***************
*** 19,27 ****
  
  # Solaris pkgmk
! 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:
--- 19,25 ----
  
  # Solaris pkgmk
! BUILDDIR = build-solaris
! PACKDIR = build-pkg
! PKGSCRIPT = pkg/solaris/solpkg
  
  solpkg:
***************
*** 29,35 ****
  	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)
  
  pkgclean:
--- 27,33 ----
  	if [ ! -d $(PACKDIR) ] ; then mkdir $(PACKDIR); fi
  	$(MAKE) all
! 	$(MAKE) DESTDIR=$$PWD/$(BUILDDIR) install
  	$(INSTALL) pkg/solaris/pkginfo $(BUILDDIR)
! 	cd $(BUILDDIR) && $(PERL) ../$(PKGSCRIPT) ../$(PACKDIR)
  
  pkgclean:





More information about the Commits mailing list