SF.net SVN: gar:[22680] csw/mgar/pkg/pound/trunk/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 22680
          http://sourceforge.net/p/gar/code/22680
Author:   dmichelsen
Date:     2013-12-12 17:10:28 +0000 (Thu, 12 Dec 2013)
Log Message:
-----------
pound/trunk: Adjust locations

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

Modified: csw/mgar/pkg/pound/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pound/trunk/Makefile	2013-12-12 17:09:54 UTC (rev 22679)
+++ csw/mgar/pkg/pound/trunk/Makefile	2013-12-12 17:10:28 UTC (rev 22680)
@@ -43,7 +43,8 @@
 EXTRA_DOCS += z2_2_5_1.py
 EXTRA_DOCS += z2_2_6_1.py
 
-POUNDCFG = $(sysconfdir)/pound.cfg
+POUNDCONFIGDIR = $(sysconfdir)/pound
+POUNDCFG = $(POUNDCONFIGDIR)/pound.cfg
 
 REINPLACEMENTS += poundcfg
 REINPLACE_MATCH_poundcfg = /usr/local/etc/pound.cfg
@@ -52,14 +53,20 @@
 
 REINPLACEMENTS += certpath
 REINPLACE_MATCH_certpath = /usr/local/etc/pound/cert.pem
-REINPLACE_WITH_certpath = $(sysconfdir)/cert.pem
+REINPLACE_WITH_certpath = $(POUNDCONFIGDIR)/cert.pem
 REINPLACE_FILES_certpath += pound.8
 
 REINPLACEMENTS += config
 REINPLACE_MATCH_config = /etc/pound/
-REINPLACE_WITH_config = $(sysconfdir)/pound/
+REINPLACE_WITH_config = $(POUNDCONFIGDIR)/
 REINPLACE_FILES_config += pound.8
 
+# Make sure to use OpenCSW OpenSSL as the generated code from Solaris OpenSSL uses different functions not present in the other libcrypto
+REINPLACEMENTS += openssl
+REINPLACE_MATCH_openssl = openssl
+REINPLACE_WITH_openssl = $(bindir)/openssl
+REINPLACE_FILES_openssl += Makefile.in
+
 BUILD64 = 1
 ISAEXEC = 1
 
@@ -91,7 +98,7 @@
 	ginstall -m 644 $(WORKSRC)/pound.8 $(DESTDIR)$(mandir)/man8/pound.8
 	ginstall -m 644 $(WORKSRC)/poundctl.8 $(DESTDIR)$(mandir)/man8/poundctl.8
 	ginstall -d $(DESTDIR)$(sysconfdir)/$(NAME)
-	ginstall -m 644 $(FILEDIR)/pound2-sample.cfg $(DESTDIR)$(sysconfdir)/pound.cfg
+	ginstall -m 644 $(FILEDIR)/pound2-sample.cfg $(DESTDIR)$(POUNDCFG)
 	ginstall -d $(DESTDIR)$(docdir)/$(NAME)
 	ginstall -m 644 $(addprefix $(WORKSRC)/,$(EXTRA_DOCS)) $(DESTDIR)$(docdir)/$(NAME)
 	@$(MAKECOOKIE)

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