diff options
| -rwxr-xr-x | packaging/Solaris/makepkg.sh | 44 | ||||
| -rw-r--r-- | packaging/Solaris/prototype.master | 4 |
2 files changed, 42 insertions, 6 deletions
diff --git a/packaging/Solaris/makepkg.sh b/packaging/Solaris/makepkg.sh index a2521179fa..ea15eafbc3 100755 --- a/packaging/Solaris/makepkg.sh +++ b/packaging/Solaris/makepkg.sh @@ -28,6 +28,20 @@ add_dynamic_entries() echo f none samba/lib/codepages/codepage.$p=source/codepages/codepage.$p 0644 root other done + # Create unicode maps + if [ ! -f $DISTR_BASE/source/bin/make_unicodemap ]; then + echo "Missing $DISTR_BASE/source/bin/make_unicodemap. Aborting." >&2 + exit 1 + fi + + # Pull in all the unicode map files from source/codepages/CP*.TXT + list=`find $DISTR_BASE/source/codepages -name "CP*.TXT" | sed 's|^.*CP\(.*\)\.TXT|\1|'` + for umap in $list + do + $DISTR_BASE/source/bin/make_unicodemap $umap $DISTR_BASE/source/codepages/CP$umap.TXT $DISTR_BASE/source/codepages/unicode_map.$umap + echo f none samba/lib/codepages/unicode_map.$umap=source/codepages/unicode_map.$umap 0644 root other + done + # Add the binaries, docs and SWAT files echo "#\n# Binaries \n#" @@ -39,14 +53,26 @@ add_dynamic_entries() fi done echo "#\n# HTML documentation \n#" - echo d none samba/docs/htmldocs 0755 root other - cd $DISTR_BASE/docs/htmldocs - for htmldoc in * + cd $DISTR_BASE + list=`find docs/htmldocs -type d | grep -v "/CVS$"` + for docdir in $list + do + if [ -d $docdir ]; then + echo d none samba/$docdir 0755 root other + fi + done + + list=`find docs/htmldocs -type f | grep -v /CVS/` + for htmldoc in $list do if [ -f $htmldoc ]; then - echo f none samba/docs/htmldocs/$htmldoc=docs/htmldocs/$htmldoc 0644 root other + echo f none samba/$htmldoc=$htmldoc 0644 root other fi done + + # Create a symbolic link to the Samba book in docs/ for beginners + echo 's none samba/docs/samba_book=htmldocs/using_samba' + echo "#\n# Text Docs \n#" echo d none samba/docs/textdocs 0755 root other cd $DISTR_BASE/docs/textdocs @@ -58,12 +84,12 @@ add_dynamic_entries() done echo "#\n# SWAT \n#" cd $DISTR_BASE - list=`find swat -type d` + list=`find swat -type d | grep -v "/CVS$"` for i in $list do echo "d none samba/$i 0755 root other" done - list=`find swat -type f` + list=`find swat -type f | grep -v /CVS/` for i in $list do echo "f none samba/$i=$i 0644 root other" @@ -77,6 +103,12 @@ add_dynamic_entries() fi done + echo "#\n# Using Samba Book files for SWAT\n#" + cd $DISTR_BASE/docs/htmldocs + +# set up a symbolic link instead of duplicating the book tree + echo 's none samba/swat/using_samba=../docs/htmldocs/using_samba' + } if [ $# = 0 ] diff --git a/packaging/Solaris/prototype.master b/packaging/Solaris/prototype.master index c63a9d1a42..8f98104cdd 100644 --- a/packaging/Solaris/prototype.master +++ b/packaging/Solaris/prototype.master @@ -9,6 +9,7 @@ i pkginfo=./pkginfo i copyright=./copyright i request=./request i preremove=./preremove +i postinstall=./postinstall i i.swat=./i.swat i r.swat=./r.swat # @@ -80,5 +81,8 @@ f none samba/lib/regeditscripts/Win95_PlainPassword.reg=docs/Win95_PlainPassword f none samba/lib/regeditscripts/Win98_PlainPassword.reg=docs/Win98_PlainPassword.reg 0444 root other f none samba/lib/regeditscripts/Win2000_PlainPassword.reg=docs/Win2000_PlainPassword.reg 0444 root other # +# Random files +f none samba/docs/Samba-HOWTO-Collection.pdf=docs/Samba-HOWTO-Collection.pdf 0644 root other +# # Static part of prototype file ends. # |