[csw-devel] SF.net SVN: gar:[21429] csw/mgar/pkg/samba/branches/samba3/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 21429
          http://gar.svn.sourceforge.net/gar/?rev=21429&view=rev
Author:   dmichelsen
Date:     2013-07-03 13:52:45 +0000 (Wed, 03 Jul 2013)
Log Message:
-----------
samba/branches/samba3: Fix merging of 64 bit /usr/lib

Modified Paths:
--------------
    csw/mgar/pkg/samba/branches/samba3/Makefile

Modified: csw/mgar/pkg/samba/branches/samba3/Makefile
===================================================================
--- csw/mgar/pkg/samba/branches/samba3/Makefile	2013-07-03 11:40:15 UTC (rev 21428)
+++ csw/mgar/pkg/samba/branches/samba3/Makefile	2013-07-03 13:52:45 UTC (rev 21429)
@@ -353,7 +353,8 @@
 MIGRATE_FILES_CSWsamba += samba
 PRESERVECONF += $(sysconfdir)/samba/smb.conf
 
-EXTRA_MERGE_DIRS_isa-extra += /usr/lib
+EXTRA_MERGE_DIRS_isa-extra += /usr/lib/64
+MERGEBASE_/usr/lib/64 = /usr/lib
 
 include gar/category.mk
 

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