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

[chninkel at users.sourceforge.net]

Revision: 20541
          http://gar.svn.sourceforge.net/gar/?rev=20541&view=rev
Author:   chninkel
Date:     2013-03-30 15:41:03 +0000 (Sat, 30 Mar 2013)
Log Message:
-----------
openssl1/trunk: only tweak MERGE_DIRS for 64 bits ISA

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

Modified: csw/mgar/pkg/openssl1/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl1/trunk/Makefile	2013-03-29 20:44:39 UTC (rev 20540)
+++ csw/mgar/pkg/openssl1/trunk/Makefile	2013-03-30 15:41:03 UTC (rev 20541)
@@ -154,9 +154,10 @@
 EXTRA_BUILD_ISAS_sparc = sparcv8plus+vis sparcv9
 
 # the openssl build system doesn't honor bindir
-# aso it doesn't install 64 bits binaries in bin/amd64
-# we fix at the merge step 
-EXTRA_MERGE_DIRS_isa-extra = $(bindir_install)
+# as it doesn't install 64 bits binaries in bin/{amd64,sparcv9}
+# we fix this at the merge step 
+EXTRA_MERGE_DIRS_isa-amd64 = $(bindir_install)
+EXTRA_MERGE_DIRS_isa-sparcv9 = $(bindir_install)
 
 # c_rehash is shell script: no isaexec please
 EXTRA_ISAEXEC_EXCLUDE_FILES = /opt/csw/bin/c_rehash

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