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

[chninkel at users.sourceforge.net]

Revision: 17913
          http://gar.svn.sourceforge.net/gar/?rev=17913&view=rev
Author:   chninkel
Date:     2012-05-01 13:58:05 +0000 (Tue, 01 May 2012)
Log Message:
-----------
openssl1/trunk: moved PKCS11 specific instructions so CONFIGURE_ARGS are correctly set

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

Modified: csw/mgar/pkg/openssl1/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl1/trunk/Makefile	2012-05-01 08:30:28 UTC (rev 17912)
+++ csw/mgar/pkg/openssl1/trunk/Makefile	2012-05-01 13:58:05 UTC (rev 17913)
@@ -114,15 +114,6 @@
 # (patchs taken from Debian Package)
 PATCHFILES += block_bad_certificates.patch
 
-# support for pkcs11 engine http://blogs.sun.com/chichang1/entry/how_to_integrate_pkcs11_engine
-ifdef PKCS11
-        PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 solaris10-sparc solaris10-i386
-ifneq ($(shell /usr/bin/uname -r),5.9)
-        PATCHFILES += pkcs11_engine-1.0.1b.patch.2012-04-30
-        CONFIGURE_ARGS += --pk11-libname=$(abspath /usr/lib/$(MM_LIBDIR)/libpkcs11.so) 
-endif
-endif 
-
 LICENSE = LICENSE
 
 ##### Build and installation information #####
@@ -152,6 +143,17 @@
 
 CONFIGURE_ARGS = --prefix=$(prefix) --openssldir=$(prefix)/etc/ssl shared $($(ISA)_OS_COMPILER) --install_prefix=$(DESTDIR)
 
+
+# support for pkcs11 engine http://blogs.sun.com/chichang1/entry/how_to_integrate_pkcs11_engine
+ifdef PKCS11
+        PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 solaris10-sparc solaris10-i386
+ifneq ($(shell /usr/bin/uname -r),5.9)
+        PATCHFILES += pkcs11_engine-1.0.1b.patch.2012-04-30
+        CONFIGURE_ARGS += --pk11-libname=$(abspath /usr/lib/$(MM_LIBDIR)/libpkcs11.so) 
+endif
+endif 
+
+
 # For now we want the sun perl to be used
 CONFIGURE_ENV += PERL="/usr/bin/perl"
 

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