solaris packagaing fixes from Brian King

(This used to be commit 0f8f2b57ea41f5481ec8da2e98958087b6b07a13)

2 files changed, 16 insertions, 1 deletions

diff --git a/packaging/Solaris/makepkg.sh.tmpl b/packaging/Solaris/makepkg.sh.tmpl
index 55a2da2c6a..d1da9d5f12 100755
--- a/packaging/Solaris/makepkg.sh.tmpl
+++ b/packaging/Solaris/makepkg.sh.tmpl
@@ -18,7 +18,14 @@ add_dynamic_entries()
   for binfile in *
   do
     if [ -f $binfile ]; then
-      echo f none samba/bin/$binfile=source/bin/$binfile 0755 root other
+	case $file in 
+	CP*.so)
+	 echo echo f none samba/lib/charset/$binfile=source/bin/$binfile 0755 root other
+	 ;;
+	*)
+         echo f none samba/bin/$binfile=source/bin/$binfile 0755 root other
+	;;
+	esac
     fi
   done
 
@@ -42,6 +49,13 @@ add_dynamic_entries()
  	echo s none /usr/lib/nss_winbind.so.2=/usr/lib/libnss_winbind.so 0755 root other
     fi
 
+ # add the .dat codepages
+  echo "#\n# Codepages \n#"
+    for file in $DISTR_BASE/source/codepages/*.dat ; do
+      bfile=`basename $file`
+      echo f none /usr/local/samba/lib/$bfile=source/codepages/$bfile
+    done
+
   # Add the manpages
   echo "#\n# man pages \n#"
   echo d none /usr ? ? ?
diff --git a/packaging/Solaris/prototype.master b/packaging/Solaris/prototype.master
index ff5ba895b3..6c5aa3e28a 100644
--- a/packaging/Solaris/prototype.master
+++ b/packaging/Solaris/prototype.master
@@ -37,6 +37,7 @@ d none samba/docs 0755 root other
 #
 # Stuff that goes into lib
 #
+d none samba/lib/charset 0755 root other
 f none samba/lib/smb.conf.example=examples/smb.conf.default 0644 root other
 d none samba/lib/regeditscripts 0755 root other
 f none samba/lib/regeditscripts/NT4_PlainPassword.reg=docs/Registry/NT4_PlainPassword.reg 0444 root other