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

[lblume at users.sourceforge.net]

Revision: 21424
          http://gar.svn.sourceforge.net/gar/?rev=21424&view=rev
Author:   lblume
Date:     2013-07-02 10:11:42 +0000 (Tue, 02 Jul 2013)
Log Message:
-----------
samba/branches/samba3: Fix the system symlinking

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-02 09:38:21 UTC (rev 21423)
+++ csw/mgar/pkg/samba/branches/samba3/Makefile	2013-07-02 10:11:42 UTC (rev 21424)
@@ -168,8 +168,10 @@
 CATALOGNAME_CSWsamba-nss-system-links = samba_nss_system_links
 PKGFILES_CSWsamba-nss-system-links += /usr/lib/nss_winbind_csw.so.1
 PKGFILES_CSWsamba-nss-system-links += /usr/lib/nss_wins_csw.so.1
-PKGFILES_CSWsamba-nss-system-links += /usr/lib/64/nss_winbind_csw.so.1
-PKGFILES_CSWsamba-nss-system-links += /usr/lib/64/nss_wins_csw.so.1
+PKGFILES_CSWsamba-nss-system-links += /usr/lib/amd64/nss_winbind_csw.so.1
+PKGFILES_CSWsamba-nss-system-links += /usr/lib/amd64/nss_wins_csw.so.1
+PKGFILES_CSWsamba-nss-system-links += /usr/lib/sparcv9/nss_winbind_csw.so.1
+PKGFILES_CSWsamba-nss-system-links += /usr/lib/sparcv9/nss_wins_csw.so.1
 SPKG_DESC_CSWsamba-nss-system-links += Samba nss modules links for the system
 RUNTIME_DEP_PKGS_CSWsamba-nss-system-links += CSWsamba-nss
 CHECKPKG_OVERRIDES_CSWsamba-nss-system-links += surplus-dependency|CSWsamba-nss
@@ -343,7 +345,6 @@
 # Tests need root
 SKIPTEST ?= 1
 
-
 INSTALL_SCRIPTS = $(WORKSRC)/source3/Makefile
 
 INITSMF += /etc/opt/csw/init.d/cswsamba
@@ -352,8 +353,16 @@
 MIGRATE_FILES_CSWsamba += samba
 PRESERVECONF += $(sysconfdir)/samba/smb.conf
 
+EXTRA_MERGE_DIRS_isa-extra += /usr/lib
+
 include gar/category.mk
 
+# Set the target dir for modules with the proper arch
+MODULE_DIR = /usr/lib
+ifeq ($(MEMORYMODEL),64)
+        MODULE_DIR = /usr/lib/64
+endif
+
 # Use this hack until this bug has been fixed:
 #   https://bugzilla.samba.org/show_bug.cgi?id=8571
 post-extract-modulated:
@@ -377,19 +386,17 @@
 	ginstall $(WORKSRC)/nsswitch/nss_wins.so $(DESTDIR)/$(libdir)/nss_wins.so.1
 	# This bit is to install the symlinks to use the NSS modules with the
 	# system's nsswitch.conf
+	ginstall -d  -m 0755 $(DESTDIR)$(MODULE_DIR)
 	if [ "$(MEMORYMODEL)" = "32" ]; then \
-		ginstall -d $(DESTDIR)/usr/lib; \
-		ln -s ../../opt/csw/lib/nss_winbind.so.1 \
-			$(DESTDIR)/usr/lib/nss_winbind_csw.so.1; \
-		ln -s ../../opt/csw/lib/nss_wins.so.1 \
-			$(DESTDIR)/usr/lib/nss_wins_csw.so.1; \
+		ln -s ../..$(libdir)/nss_winbind.so.1 \
+			$(DESTDIR)$(MODULE_DIR)/nss_winbind_csw.so.1; \
+		ln -s ../..$(libdir)/nss_wins.so.1 \
+			$(DESTDIR)$(MODULE_DIR)/nss_wins_csw.so.1; \
+	else \
+		ln -s ../../..$(libdir)/nss_winbind.so.1 \
+			$(DESTDIR)$(MODULE_DIR)/nss_winbind_csw.so.1; \
+		ln -s ../../..$(libdir)/nss_wins.so.1 \
+			$(DESTDIR)$(MODULE_DIR)/nss_wins_csw.so.1; \
 	fi
-	if [ "$(MEMORYMODEL)" = "64" ]; then \
-		ginstall -d $(DESTDIR)/usr/lib/$(MEMORYMODEL); \
-		ln -s ../../../opt/csw/lib/$(MEMORYMODEL)/nss_winbind.so.1 \
-			$(DESTDIR)/usr/lib/$(MEMORYMODEL)/nss_winbind_csw.so.1; \
-		ln -s ../../../opt/csw/lib/$(MEMORYMODEL)/nss_wins.so.1 \
-			$(DESTDIR)/usr/lib/$(MEMORYMODEL)/nss_wins_csw.so.1; \
-	fi
 	@$(MAKECOOKIE)
 

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