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

[cgrzemba at users.sourceforge.net]

Revision: 16592
          http://gar.svn.sourceforge.net/gar/?rev=16592&view=rev
Author:   cgrzemba
Date:     2011-12-21 15:57:32 +0000 (Wed, 21 Dec 2011)
Log Message:
-----------
svrcore/trunk: prettified buildrecipe

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

Modified: csw/mgar/pkg/svrcore/trunk/Makefile
===================================================================
--- csw/mgar/pkg/svrcore/trunk/Makefile	2011-12-21 14:53:50 UTC (rev 16591)
+++ csw/mgar/pkg/svrcore/trunk/Makefile	2011-12-21 15:57:32 UTC (rev 16592)
@@ -15,15 +15,9 @@
 MASTER_SITES = http://ftp.mozilla.org/pub/directory/svrcore/releases/4.0.4/src/
 DISTFILES  = $(NAME)-$(VERSION).tar.bz2
 
-# File name regex to get notifications about upstream software releases
-# NOTE: Use this only if the automatic regex creation
-#       does not work for your package
-# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+PACKAGING_PLATFORMS += solaris10-sparc
+PACKAGING_PLATFORMS += solaris10-i386
 
-# If the url used to check for software update is different of MASTER_SITES, then 
-# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES
-# UPSTREAM_MASTER_SITES = 
-
 PACKAGES += CSWlibsvrcore0
 CATALOGNAME_CSWlibsvrcore0 = libsvrcore0
 SPKG_DESC_CSWlibsvrcore0 += $(DESCRIPTION)
@@ -32,8 +26,6 @@
 RUNTIME_DEP_PKGS_CSWlibsvrcore0 += CSWlibnss3
 RUNTIME_DEP_PKGS_CSWlibsvrcore0 += CSWlibplc4
 RUNTIME_DEP_PKGS_CSWlibsvrcore0 += CSWlibplds4
-PACKAGING_PLATFORMS += solaris10-sparc
-PACKAGING_PLATFORMS += solaris10-i386
 
 PACKAGES += CSWlibsvrcore0-dev
 CATALOGNAME_CSWlibsvrcore0-dev = libsvrcore0_dev
@@ -42,10 +34,11 @@
 PKGFILES_CSWlibsvrcore0-dev += /opt/csw/lib/libsvrcore.so
 PKGFILES_CSWlibsvrcore0-dev += /opt/csw/lib/sparcv9/libsvrcore.so
 ARCHALL_CSWgnutlsdevel = 1
+RUNTIME_DEP_PKGS_CSWlibsvrcore0-dev += CSWlibsvrcore0
 
 # Move the include files to include/nspr to prevent polluting the main
 # header file namespace.
-includedir = $(prefix)/include/nspr
+# includedir = $(prefix)/include/nspr
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS_isa-sparcv9 = --enable-64bit
@@ -56,17 +49,13 @@
 CONFIGURE_ARGS_OPT += --enable-strip
 CONFIGURE_ARGS_DBG += --enable-debug
 CONFIGURE_ARGS_DBG += --disable-strip
-CONFIGURE_ARGS_OPT += --with-nss-inc=/opt/csw/include/nss
-CONFIGURE_ARGS_OPT += --with-nss-lib=/opt/csw/lib
-CONFIGURE_ARGS_OPT += --with-nspr-inc=/opt/csw/include/nspr
-CONFIGURE_ARGS_OPT += --with-nspr-lib=/opt/csw/lib
+CONFIGURE_ARGS_OPT += --with-nss-inc=$(includedir)/nss
+CONFIGURE_ARGS_OPT += --with-nss-lib=$(libdir)
+CONFIGURE_ARGS_OPT += --with-nspr-inc=$(includedir)/nspr
+CONFIGURE_ARGS_OPT += --with-nspr-lib=/$(libdir)
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR))
 
-
-RUNTIME_DEP_PKGS_CSWlibsvrcore0-dev += CSWlibsvrcore0
-
 BUILD64 = 1
 
 include gar/category.mk
 
-

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