SF.net SVN: gar:[26369] csw/mgar/pkg/openssl1/branches/lts102/Makefile

[janholzh at users.sourceforge.net]

Revision: 26369
          http://sourceforge.net/p/gar/code/26369
Author:   janholzh
Date:     2018-02-28 10:12:56 +0000 (Wed, 28 Feb 2018)
Log Message:
-----------
openssl1/branches/lts102: fix build, enable pkcs11-engine again

Modified Paths:
--------------
    csw/mgar/pkg/openssl1/branches/lts102/Makefile

Modified: csw/mgar/pkg/openssl1/branches/lts102/Makefile
===================================================================
--- csw/mgar/pkg/openssl1/branches/lts102/Makefile	2018-02-26 10:02:31 UTC (rev 26368)
+++ csw/mgar/pkg/openssl1/branches/lts102/Makefile	2018-02-28 10:12:56 UTC (rev 26369)
@@ -154,14 +154,11 @@
 # Bug opened upstream: http://rt.openssl.org/Ticket/Display.html?id=3153
 PATCHFILES += make_issetugid_support_configurable.patch
 
-ifdef PKCS11
-        PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 solaris10-sparc solaris10-i386
 ifneq ($(shell /usr/bin/uname -r),5.9)
 	PATCHFILES += openssl-1.0.2h-pkcs11-engine.patch
 	ENGINES += pk11
         CONFIGURE_ARGS += --pk11-libname=$(abspath /usr/lib/$(MM_LIBDIR)/libpkcs11.so)
 endif
-endif
 
 
 
@@ -252,7 +249,7 @@
 LIBDIR_64 = --libdir=lib/64
 LIBDIR = $(LIBDIR_$(MEMORYMODEL))
 
-CONFIGURE_ARGS = --prefix=$(prefix)
+CONFIGURE_ARGS += --prefix=$(prefix)
 CONFIGURE_ARGS += --openssldir=$(sysconfdir)/ssl
 CONFIGURE_ARGS += --install_prefix=$(DESTDIR) $(LIBDIR)
 CONFIGURE_ARGS += $(CONFIGURE_FLAGS)

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