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

[dmichelsen at users.sourceforge.net]

Revision: 25557
          http://sourceforge.net/p/gar/code/25557
Author:   dmichelsen
Date:     2016-02-08 14:31:57 +0000 (Mon, 08 Feb 2016)
Log Message:
-----------
samba/branches/samba3: Adjust 64 bit dirs in /usr/lib to work with merging. This was broken in r23841

Revision Links:
--------------
    http://sourceforge.net/p/gar/code/23841

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

Modified: csw/mgar/pkg/samba/branches/samba3/Makefile
===================================================================
--- csw/mgar/pkg/samba/branches/samba3/Makefile	2016-02-08 13:13:46 UTC (rev 25556)
+++ csw/mgar/pkg/samba/branches/samba3/Makefile	2016-02-08 14:31:57 UTC (rev 25557)
@@ -423,14 +423,9 @@
 GARCOMPILER = $(GARCOMPILER_$(GAROSREL))
 
 # Set the target dir for modules with the proper arch
-NSS_MODULE_DIR = /usr/lib
-PAM_MODULE_DIR = /usr/lib/security
+NSS_MODULE_DIR = /usr/lib/$(MM_LIBDIR)
+PAM_MODULE_DIR = /usr/lib/security/$(MM_LIBDIR)
 
-ifeq ($(MEMORYMODEL),64)
-	NSS_MODULE_DIR = /usr/lib/$(ISA)
-	PAM_MODULE_DIR = /usr/lib/security/$(ISA)
-endif
-
 # Define the targets for the links
 NSS_WINBIND_32 = ../..$(libdir)/nss_winbind.so.1
 NSS_WINS_32    = ../..$(libdir)/nss_wins.so.1

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