[csw-devel] SF.net SVN: gar:[3825] csw/mgar/pkg/nagios/trunk/Makefile

[j_arndt at users.sourceforge.net]

Revision: 3825
          http://gar.svn.sourceforge.net/gar/?rev=3825&view=rev
Author:   j_arndt
Date:     2009-03-19 19:09:17 +0000 (Thu, 19 Mar 2009)

Log Message:
-----------
nagios: makefile clean up

Modified Paths:
--------------
    csw/mgar/pkg/nagios/trunk/Makefile

Modified: csw/mgar/pkg/nagios/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nagios/trunk/Makefile	2009-03-19 18:48:13 UTC (rev 3824)
+++ csw/mgar/pkg/nagios/trunk/Makefile	2009-03-19 19:09:17 UTC (rev 3825)
@@ -7,7 +7,7 @@
   Nagios is a powerful, enterprise-class host, service, application, and network monitoring program. Designed to be fast, flexible, and rock-solid stable. Nagios runs on *NIX hosts and can monitor Windows, Linux/Unix/BSD, Netware, and network devices.
 endef
 
-MASTER_SITES =$(SF_MIRRORS)
+MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
 DISTFILES += $(call admfiles,CSWnagios,checkinstall preinstall preremove prototype )
 DISTFILES += cswnagios
@@ -26,23 +26,19 @@
 
 SPKG_CLASSES = none cswinitsmf
 
+prefix = $(BUILD_PREFIX)/nagios
+libexecdir = $(BUILD_PREFIX)/libexec/nagios-plugins
+
 CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += --prefix=/opt/csw/nagios
-CONFIGURE_ARGS += --exec-prefix=/opt/csw/nagios
+CONFIGURE_ARGS += --prefix=$(prefix)
+CONFIGURE_ARGS += --exec-prefix=$(exec_prefix)
 CONFIGURE_ARGS += --with-command-user=nagios
 CONFIGURE_ARGS += --with-command-group=nagios
-CONFIGURE_ARGS += --with-httpd-conf=/opt/csw/nagios/etc
+CONFIGURE_ARGS += --with-httpd-conf=$(sysconfdir)
 CONFIGURE_ARGS += --enable-embedded-perl
 
-sysconfdir ?= $(prefix)/nagios/etc
-localstatedir ?= $(prefix)/nagios/var
-bindir ?= $(prefix)/nagios/bin
-sbindir ?= $(prefix)/nagios/sbin
-libexecdir ?= $(prefix)/libexec/nagios-plugins
-datadir ?= $(prefix)/nagios/share
+EXTRA_LIB = $(BUILD_PREFIX)/lib
 
-EXTRA_LIB = /opt/csw/lib
-
 BUILD_ARGS = all
 
 TEST_TARGET = none
@@ -51,14 +47,14 @@
 INSTALL_ARGS += install-config
 INSTALL_ARGS += install-commandmode
 
+
 include gar/category.mk
 
 DOCS = Changelog INSTALLING README UPGRADING
-DOCDEST = $(DESTDIR)$(prefix)/share/doc/nagios
+DOCDEST = $(DESTDIR)$(BUILD_PREFIX)/share/doc/nagios
 HTTPD_CONF = $(DESTDIR)$(sysconfdir)
 
 post-install-modulated:
-	@echo $(DOCDEST)
 	@ginstall -m 755 -d  $(DOCDEST)
 	@$(foreach DOC,$(DOCS),ginstall -m 644 $(WORKSRC)/$(DOC) $(DOCDEST);)
 	@ginstall -m 644 $(WORKSRC)/LICENSE $(DOCDEST)
@@ -66,4 +62,3 @@
 	@ginstall -d $(DESTDIR)/etc/opt/csw/init.d
 	@ginstall -m 755 $(FILEDIR)/cswnagios $(DESTDIR)/etc/opt/csw/init.d/cswnagios
 	@$(MAKECOOKIE)
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.