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

[skayser at users.sourceforge.net]

Revision: 6199
          http://gar.svn.sourceforge.net/gar/?rev=6199&view=rev
Author:   skayser
Date:     2009-09-05 20:58:25 +0000 (Sat, 05 Sep 2009)

Log Message:
-----------
spine: tweaked configure phase

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

Modified: csw/mgar/pkg/spine/trunk/Makefile
===================================================================
--- csw/mgar/pkg/spine/trunk/Makefile	2009-09-05 18:53:15 UTC (rev 6198)
+++ csw/mgar/pkg/spine/trunk/Makefile	2009-09-05 20:58:25 UTC (rev 6199)
@@ -12,6 +12,7 @@
 #DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
 DISTFILES  = cacti-$(GARNAME)-$(GARVERSION).tar.gz
 DISTFILES += cswusergroup CSWspine.postinstall
+DISTNAME = cacti-$(GARNAME)-$(GARVERSION)
 
 PATCHFILES += configure.diff
 
@@ -30,16 +31,10 @@
 
 SPKG_CLASSES = none cswpreserveconf
 
-WORKSRC = $(WORKDIR)/cacti-$(GARNAME)-$(GARVERSION)
-
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-mysql=/opt/csw/mysql5
 CONFIGURE_ARGS += --with-snmp=/opt/csw/include/net-snmp
 
-EXTRA_LIB += $(BUILD_PREFIX)/lib
-LD_OPTIONS += -L/opt/csw/lib
-
-CONFIGURE_SCRIPTS = custom
 INSTALL_SCRIPTS = custom
 
 SKIPTEST = 1
@@ -50,15 +45,14 @@
 
 include gar/category.mk
 
-configure-custom:
-	@echo " ==> Configuring in $(WORKSRC)"
+pre-configure-modulated:
+	@echo " ==> Pre-configure in $(WORKSRC)"
 	@rm $(WORKSRC)/config/ltmain.sh
 	@rm $(WORKSRC)/config/config.sub
 	@rm $(WORKSRC)/config/config.guess
 	@ln -s /opt/csw/share/libtool/config/ltmain.sh  $(WORKSRC)/config/ltmain.sh
 	@ln -s /opt/csw/share/libtool/config/config.sub  $(WORKSRC)/config/config.sub
 	@ln -s /opt/csw/share/libtool/config/config.guess  $(WORKSRC)/config/config.guess
-	@( cd $(WORKSRC) ; ./configure $(CONFIGURE_ARGS) )
 	@$(MAKECOOKIE)
 
 install-custom:


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