SF.net SVN: gar:[23936] csw/mgar/pkg/openssl1/trunk/Makefile

[chninkel at users.sourceforge.net]

Revision: 23936
          http://sourceforge.net/p/gar/code/23936
Author:   chninkel
Date:     2014-08-07 20:52:21 +0000 (Thu, 07 Aug 2014)
Log Message:
-----------
openssl1/trunk: move OPENSSLDIR in /etc/opt/csw/ssl

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

Modified: csw/mgar/pkg/openssl1/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl1/trunk/Makefile	2014-08-07 19:28:42 UTC (rev 23935)
+++ csw/mgar/pkg/openssl1/trunk/Makefile	2014-08-07 20:52:21 UTC (rev 23936)
@@ -245,6 +245,7 @@
 LIBDIR = $(LIBDIR_$(MEMORYMODEL))
 
 CONFIGURE_ARGS = --prefix=$(prefix)
+CONFIGURE_ARGS += --openssldir=$(sysconfdir)/ssl
 CONFIGURE_ARGS += --install_prefix=$(DESTDIR) $(LIBDIR)
 CONFIGURE_ARGS += $(CONFIGURE_FLAGS)
 CONFIGURE_ARGS += $($(ISA)_$(GARCOMPILER_TYPE)_CONFIGURE_TARGET)
@@ -306,13 +307,10 @@
 	@$(MAKECOOKIE)
 
 install-conf-misc:
-	if [ -f "$(PKGROOT)$(prefix)/ssl/openssl.cnf" ] && [ ! -h "$(PKGROOT)$(prefix)/ssl/openssl.cnf" ]; then \
-		ginstall -d "$(PKGROOT)$(sysconfdir)/ssl"; \
-		mv "$(PKGROOT)$(prefix)/ssl/openssl.cnf" $(PKGROOT)$(sysconfdir)/ssl/openssl.cnf.CSW; \
-		ln -sf ../../..$(sysconfdir)/ssl/openssl.cnf $(PKGROOT)$(prefix)/ssl/openssl.cnf; \
-	fi
+	[ ! -f "$(PKGROOT)$(sysconfdir)/ssl/openssl.cnf" ] || \
+		mv "$(PKGROOT)$(sysconfdir)/ssl/openssl.cnf" $(PKGROOT)$(sysconfdir)/ssl/openssl.cnf.CSW
 	[ ! -d "$(PKGROOT)$(sysconfdir)/ssl/misc" ] || \
-		mv "$(PKGROOT)$(sysconfdir)/ssl/misc" "$(PKGROOT)/$(prefix)/ssl/"
+		( ginstall -d "$(PKGROOT)/$(prefix)/ssl/" && mv "$(PKGROOT)$(sysconfdir)/ssl/misc/" "$(PKGROOT)/$(prefix)/ssl/" )
 
 merge-doc:
 	for CATALOGNAME in $(foreach PKG, $(PACKAGES), $(call catalogname,$(PKG))); do \

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