From 0e8fd3398771da2f016d72830179507f3edda51b Mon Sep 17 00:00:00 2001 From: Samba Release Account Date: Sat, 4 May 1996 07:50:46 +0000 Subject: Initial version imported to CVS (This used to be commit 291551d80711daab7b7581720bcd9a08d6096517) --- source3/script/installman.sh | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100755 source3/script/installman.sh (limited to 'source3/script/installman.sh') diff --git a/source3/script/installman.sh b/source3/script/installman.sh new file mode 100755 index 0000000000..a79d157c5f --- /dev/null +++ b/source3/script/installman.sh @@ -0,0 +1,35 @@ +#!/bin/sh +MANDIR=$1 +SRCDIR=$2 + +echo Installing man pages in $MANDIR + +for d in $MANDIR $MANDIR/man1 $MANDIR/man5 $MANDIR/man7 $MANDIR/man8; do +if [ ! -d $d ]; then +mkdir $d +if [ ! -d $d ]; then + echo Failed to make directory $d + exit 1 +fi +fi +done + +cp $SRCDIR../docs/*.1 $MANDIR/man1 +cp $SRCDIR../docs/*.5 $MANDIR/man5 +cp $SRCDIR../docs/*.8 $MANDIR/man8 +cp $SRCDIR../docs/*.7 $MANDIR/man7 +echo Setting permissions on man pages +chmod 0644 $MANDIR/man1/smbstatus.1 +chmod 0644 $MANDIR/man1/smbclient.1 +chmod 0644 $MANDIR/man1/smbrun.1 +chmod 0644 $MANDIR/man1/testparm.1 +chmod 0644 $MANDIR/man1/testprns.1 +chmod 0644 $MANDIR/man1/smbtar.1 +chmod 0644 $MANDIR/man5/smb.conf.5 +chmod 0644 $MANDIR/man7/samba.7 +chmod 0644 $MANDIR/man8/smbd.8 +chmod 0644 $MANDIR/man8/nmbd.8 + +echo Man pages installed +exit 0 + -- cgit From 2285033933448836e1c0e3e1c4b75da941a6c9b8 Mon Sep 17 00:00:00 2001 From: Samba Release Account Date: Fri, 5 Jul 1996 03:51:27 +0000 Subject: Changed install scripts so they don't have hardcoded values Dan (This used to be commit 2eccc5eea289fa4b6af120d0bc92d568ca925482) --- source3/script/installman.sh | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) (limited to 'source3/script/installman.sh') diff --git a/source3/script/installman.sh b/source3/script/installman.sh index a79d157c5f..3c8fc71865 100755 --- a/source3/script/installman.sh +++ b/source3/script/installman.sh @@ -1,4 +1,6 @@ #!/bin/sh +#5 July 96 Dan.Shearer@unisa.edu.au removed hardcoded values + MANDIR=$1 SRCDIR=$2 @@ -8,28 +10,29 @@ for d in $MANDIR $MANDIR/man1 $MANDIR/man5 $MANDIR/man7 $MANDIR/man8; do if [ ! -d $d ]; then mkdir $d if [ ! -d $d ]; then - echo Failed to make directory $d + echo Failed to make directory $d, does $USER have privileges? exit 1 fi fi done -cp $SRCDIR../docs/*.1 $MANDIR/man1 -cp $SRCDIR../docs/*.5 $MANDIR/man5 -cp $SRCDIR../docs/*.8 $MANDIR/man8 -cp $SRCDIR../docs/*.7 $MANDIR/man7 -echo Setting permissions on man pages -chmod 0644 $MANDIR/man1/smbstatus.1 -chmod 0644 $MANDIR/man1/smbclient.1 -chmod 0644 $MANDIR/man1/smbrun.1 -chmod 0644 $MANDIR/man1/testparm.1 -chmod 0644 $MANDIR/man1/testprns.1 -chmod 0644 $MANDIR/man1/smbtar.1 -chmod 0644 $MANDIR/man5/smb.conf.5 -chmod 0644 $MANDIR/man7/samba.7 -chmod 0644 $MANDIR/man8/smbd.8 -chmod 0644 $MANDIR/man8/nmbd.8 +for sect in 1 5 7 8 ; do + for m in $MANDIR/man$sect ; do + for s in $SRCDIR../docs/*$sect; do + FNAME=$m/`basename $s` + cp $s $m || echo Cannot create $FNAME... does $USER have privileges? + chmod 0644 $FNAME + done + done +done + +cat << EOF +====================================================================== +The man pages have been installed. You may uninstall them using the command +the command "make uninstallman" or make "uninstall" to uninstall binaries, +man pages and shell scripts. +====================================================================== +EOF -echo Man pages installed exit 0 -- cgit From 64578c0589a3a741f81fb55c16eeb882128da00b Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 29 Jul 1998 03:08:05 +0000 Subject: merge from the autoconf2 branch to the main branch (This used to be commit 3bda7ac417107a7b01d91805ca71c4330657ed21) --- source3/script/installman.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/script/installman.sh') diff --git a/source3/script/installman.sh b/source3/script/installman.sh index 3c8fc71865..95611dcc22 100755 --- a/source3/script/installman.sh +++ b/source3/script/installman.sh @@ -2,7 +2,7 @@ #5 July 96 Dan.Shearer@unisa.edu.au removed hardcoded values MANDIR=$1 -SRCDIR=$2 +SRCDIR=$2/ echo Installing man pages in $MANDIR -- cgit From 1c6f52cc284a75e304d10c098088c1c846c9efc8 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 10 Aug 1998 01:55:42 +0000 Subject: fixed the installation scripts for the new layout (This used to be commit 60cdb83f3f6dfd7755e46254662245a82a8ef498) --- source3/script/installman.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/script/installman.sh') diff --git a/source3/script/installman.sh b/source3/script/installman.sh index 95611dcc22..12a63e26c0 100755 --- a/source3/script/installman.sh +++ b/source3/script/installman.sh @@ -20,6 +20,7 @@ for sect in 1 5 7 8 ; do for m in $MANDIR/man$sect ; do for s in $SRCDIR../docs/*$sect; do FNAME=$m/`basename $s` + echo Installing $FNAME cp $s $m || echo Cannot create $FNAME... does $USER have privileges? chmod 0644 $FNAME done -- cgit From d90f25d38098de5e41e745e801a8dcbab727c285 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 11 Nov 1998 00:40:24 +0000 Subject: Added manpages/ to source path. Jeremy. (This used to be commit 0f7977ef74af1cbb7e92df8cb1b5545247056b52) --- source3/script/installman.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/script/installman.sh') diff --git a/source3/script/installman.sh b/source3/script/installman.sh index 12a63e26c0..ba78b56806 100755 --- a/source3/script/installman.sh +++ b/source3/script/installman.sh @@ -18,7 +18,7 @@ done for sect in 1 5 7 8 ; do for m in $MANDIR/man$sect ; do - for s in $SRCDIR../docs/*$sect; do + for s in $SRCDIR../docs/manpages/*$sect; do FNAME=$m/`basename $s` echo Installing $FNAME cp $s $m || echo Cannot create $FNAME... does $USER have privileges? -- cgit From 8fc1504ff8204dd1ca735f31c769f6dadf0f88cb Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 13 Nov 1998 21:41:01 +0000 Subject: Makefile.in configure configure.in include/config.h.in: Changes for DGUX and UNIXWARE. groupdb/aliasdb.c groupdb/aliasfile.c groupdb/groupfile.c: Don't use snprinf, use slprintf. include/includes.h: Fix YP problem. include/smb.h: Fix ZERO_STRUCTP. lib/util_sock.c: Added strerror() in debugs. passdb/ldap.c: Don't use snprinf, use slprintf. rpc_client/cli_lsarpc.c rpc_client/cli_pipe.c rpc_parse/parse_sec.c rpc_server/srv_pipe.c: Don't use snprinf, use slprintf. script/installman.sh: DGUX changes. smbd/open.c smbd/oplock.c: Fixed gcc warnings. web/swat.c: Changes USER to SWAT_USER. (This used to be commit 4c2b5a00983501e5d4aad1456ba8b5ab0dfd9b4c) --- source3/script/installman.sh | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) (limited to 'source3/script/installman.sh') diff --git a/source3/script/installman.sh b/source3/script/installman.sh index ba78b56806..12e49fcda3 100755 --- a/source3/script/installman.sh +++ b/source3/script/installman.sh @@ -3,6 +3,9 @@ MANDIR=$1 SRCDIR=$2/ +if [ $# -ge 3 ] ; then + GROFF=$3 # sh cmd line, including options +fi echo Installing man pages in $MANDIR @@ -20,9 +23,24 @@ for sect in 1 5 7 8 ; do for m in $MANDIR/man$sect ; do for s in $SRCDIR../docs/manpages/*$sect; do FNAME=$m/`basename $s` - echo Installing $FNAME - cp $s $m || echo Cannot create $FNAME... does $USER have privileges? - chmod 0644 $FNAME + + # Test for writability. Involves + # blowing away existing files. + + if (rm -f $FNAME && touch $FNAME); then + rm $FNAME + if [ ! "$GROFF" ] ; then + cp $s $m # Copy raw nroff + else + echo "\t$FNAME" # groff'ing can be slow, give the user + # a warm fuzzy. + $GROFF $s > $FNAME # Process nroff, because man(1) (on + # this system) doesn't . + fi + chmod 0644 $FNAME + else + echo Cannot create $FNAME... does $USER have privileges? + fi done done done -- cgit From 3b4a9ff3809ee05a7f06c3eaddd1e5a6e35bfc49 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 16 Nov 1998 23:28:59 +0000 Subject: Makefile.in: Re-added quotes round ROFF call for DGUX. script/installman.sh: Make installman ignore ROFF argument if it is "". smbd/oplock.c: Move location of oplock test file to lockdir. Jeremy. (This used to be commit 6c25a3314243997508b0b2da4bfa10bb979e9c10) --- source3/script/installman.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/script/installman.sh') diff --git a/source3/script/installman.sh b/source3/script/installman.sh index 12e49fcda3..b3422e5b3d 100755 --- a/source3/script/installman.sh +++ b/source3/script/installman.sh @@ -29,7 +29,7 @@ for sect in 1 5 7 8 ; do if (rm -f $FNAME && touch $FNAME); then rm $FNAME - if [ ! "$GROFF" ] ; then + if [ x$GROFF = x ] ; then cp $s $m # Copy raw nroff else echo "\t$FNAME" # groff'ing can be slow, give the user -- cgit From 768761820e8d7481c586c4e0ab4ac7cb36d18c4b Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 17 Nov 1998 20:50:07 +0000 Subject: Added the same open()/fopen()/creat()/mmap() -> sys_XXX calls. Tidied up some of the mess (no other word for it). Still doesn't compile cleanly. There are calls with incorrect parameters that don't seem to be doing the right thing. This code still needs surgery :-(. Jeremy. (This used to be commit 18ff93a9abbf68ee8c59c0af3e57c63e4a015dac) --- source3/script/installman.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/script/installman.sh') diff --git a/source3/script/installman.sh b/source3/script/installman.sh index b3422e5b3d..4eda8fd537 100755 --- a/source3/script/installman.sh +++ b/source3/script/installman.sh @@ -29,7 +29,7 @@ for sect in 1 5 7 8 ; do if (rm -f $FNAME && touch $FNAME); then rm $FNAME - if [ x$GROFF = x ] ; then + if [ "x$GROFF" = x ] ; then cp $s $m # Copy raw nroff else echo "\t$FNAME" # groff'ing can be slow, give the user -- cgit From 96db4b1ba3a48f50b80b2cfbf0b940e073b7843c Mon Sep 17 00:00:00 2001 From: Motonobu Takahashi Date: Mon, 24 Sep 2001 15:55:09 +0000 Subject: Added SWAT i18n feature: TO enable configure with --with-i18n-swat to support this gettext is integrated and a new directories name "po" and "intl" are created. now these languages are supported: en - English (default) ja - Japanese po - Polish tr - Turkish To add your language, to create ${your_language}.po by translating source/po/en.po into your language is needed. some of html and image files of various language version are not included yet, though message catalogue files are installed. you need to copy files manually under ${swatdir}/lang/$ln/{help,images,included,using_samba} And also added a option to intall manual pages: of various lang version To enable configure with --with-manlangs but manual pages themself are not included yet. (This used to be commit 486b79a6fc4ba20a751aab544bd0f7ccff2b3d19) --- source3/script/installman.sh | 82 ++++++++++++++++++++++++++------------------ 1 file changed, 48 insertions(+), 34 deletions(-) (limited to 'source3/script/installman.sh') diff --git a/source3/script/installman.sh b/source3/script/installman.sh index 4eda8fd537..a21385711a 100755 --- a/source3/script/installman.sh +++ b/source3/script/installman.sh @@ -1,50 +1,64 @@ #!/bin/sh #5 July 96 Dan.Shearer@unisa.edu.au removed hardcoded values +# +# 13 Aug 2001 Rafal Szczesniak +# modified to accomodate international man pages (inspired +# by Japanese edition's approach) MANDIR=$1 SRCDIR=$2/ -if [ $# -ge 3 ] ; then - GROFF=$3 # sh cmd line, including options +langs=$3 + +if [ $# -ge 4 ] ; then + GROFF=$4 # sh cmd line, including options fi -echo Installing man pages in $MANDIR -for d in $MANDIR $MANDIR/man1 $MANDIR/man5 $MANDIR/man7 $MANDIR/man8; do -if [ ! -d $d ]; then -mkdir $d -if [ ! -d $d ]; then - echo Failed to make directory $d, does $USER have privileges? - exit 1 -fi -fi -done +for lang in $langs; do + if ["X$lang" = Xen ]; then + echo Installing default man pages in $MANDIR/ + lang=. + else + echo Installing \"$lang\" man pages in $MANDIR/lang/$lang + fi -for sect in 1 5 7 8 ; do - for m in $MANDIR/man$sect ; do - for s in $SRCDIR../docs/manpages/*$sect; do - FNAME=$m/`basename $s` + langdir=$MANDIR/lang/$lang + for d in $MANDIR $langdir $langdir/man1 $langdir/man5 $langdir/man7 $langdir/man8; do + if [ ! -d $d ]; then + mkdir $d + if [ ! -d $d ]; then + echo Failed to make directory $d, does $USER have privileges? + exit 1 + fi + fi + done + + for sect in 1 5 7 8 ; do + for m in $langdir/man$sect ; do + for s in $SRCDIR../docs/manpages/$lang/*$sect; do + FNAME=$m/`basename $s` - # Test for writability. Involves - # blowing away existing files. + # Test for writability. Involves + # blowing away existing files. - if (rm -f $FNAME && touch $FNAME); then - rm $FNAME - if [ "x$GROFF" = x ] ; then - cp $s $m # Copy raw nroff - else - echo "\t$FNAME" # groff'ing can be slow, give the user - # a warm fuzzy. - $GROFF $s > $FNAME # Process nroff, because man(1) (on - # this system) doesn't . - fi - chmod 0644 $FNAME - else - echo Cannot create $FNAME... does $USER have privileges? - fi + if (rm -f $FNAME && touch $FNAME); then + rm $FNAME + if [ "x$GROFF" = x ] ; then + cp $s $m # Copy raw nroff + else + echo "\t$FNAME" # groff'ing can be slow, give the user + # a warm fuzzy. + $GROFF $s > $FNAME # Process nroff, because man(1) (on + # this system) doesn't . + fi + chmod 0644 $FNAME + else + echo Cannot create $FNAME... does $USER have privileges? + fi + done + done done - done done - cat << EOF ====================================================================== The man pages have been installed. You may uninstall them using the command -- cgit From 14403d5e8acc5ad65ad682186701cca0e5a128c8 Mon Sep 17 00:00:00 2001 From: Motonobu Takahashi Date: Mon, 24 Sep 2001 18:22:46 +0000 Subject: fixed a typo in installman.sh fixed a problem that source/install-sh is not executable (This used to be commit c2e256c18cbaa1145ab6ca8ad59baadca36abbdd) --- source3/script/installman.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/script/installman.sh') diff --git a/source3/script/installman.sh b/source3/script/installman.sh index a21385711a..1cacbdbc0e 100755 --- a/source3/script/installman.sh +++ b/source3/script/installman.sh @@ -15,7 +15,7 @@ fi for lang in $langs; do - if ["X$lang" = Xen ]; then + if [ "X$lang" = Xen ]; then echo Installing default man pages in $MANDIR/ lang=. else -- cgit From f3d8f6b198708c9da9f30ff2a3132b7ead96552c Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 25 Sep 2001 02:01:29 +0000 Subject: Try to fix up manpage installation (This used to be commit a302bb20e28ea2e4d04eca34a23ff42e9bc07b05) --- source3/script/installman.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/script/installman.sh') diff --git a/source3/script/installman.sh b/source3/script/installman.sh index 1cacbdbc0e..2329ed5425 100755 --- a/source3/script/installman.sh +++ b/source3/script/installman.sh @@ -23,7 +23,7 @@ for lang in $langs; do fi langdir=$MANDIR/lang/$lang - for d in $MANDIR $langdir $langdir/man1 $langdir/man5 $langdir/man7 $langdir/man8; do + for d in $MANDIR $MANDIR/lang $langdir $langdir/man1 $langdir/man5 $langdir/man7 $langdir/man8; do if [ ! -d $d ]; then mkdir $d if [ ! -d $d ]; then -- cgit From 64c53e819b53035ff07f9fa00ca4daef18138f51 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 17 Aug 2002 15:33:49 +0000 Subject: sync 3.0 branch with HEAD (This used to be commit 6497eb78e87a6ffa4c2c61aa4ef6ecd451821a27) --- source3/script/installman.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/script/installman.sh') diff --git a/source3/script/installman.sh b/source3/script/installman.sh index 2329ed5425..5b6bba69ed 100755 --- a/source3/script/installman.sh +++ b/source3/script/installman.sh @@ -22,8 +22,8 @@ for lang in $langs; do echo Installing \"$lang\" man pages in $MANDIR/lang/$lang fi - langdir=$MANDIR/lang/$lang - for d in $MANDIR $MANDIR/lang $langdir $langdir/man1 $langdir/man5 $langdir/man7 $langdir/man8; do + langdir=$MANDIR/$lang + for d in $MANDIR $langdir $langdir/man1 $langdir/man5 $langdir/man7 $langdir/man8; do if [ ! -d $d ]; then mkdir $d if [ ! -d $d ]; then -- cgit From 629120a0a1ee0726cf6f43bf841ca042d2b0229e Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Mon, 6 Oct 2003 19:24:17 +0000 Subject: cosmetic fix when DESTDIR=/ (default) (This used to be commit e660b5752aa129c49b0b665845de2fe4c160be00) --- source3/script/installman.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/script/installman.sh') diff --git a/source3/script/installman.sh b/source3/script/installman.sh index 5b6bba69ed..c7a8f45095 100755 --- a/source3/script/installman.sh +++ b/source3/script/installman.sh @@ -5,7 +5,7 @@ # modified to accomodate international man pages (inspired # by Japanese edition's approach) -MANDIR=$1 +MANDIR=`echo $1 | sed 's/\/\//\//g'` SRCDIR=$2/ langs=$3 -- cgit From b62fae5edc6115b265660447d8833166fdd771fa Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 20 Mar 2005 21:08:50 +0000 Subject: r5915: Remove --with-manpages-languages= from configure (we only have them in one lanuage, English, at the moment). Fixes #2261. If other languages might are added in the future, this parameter will still not be needed. (This used to be commit d41e790b4ba96b42ae80f51925a86a3344d3fd39) --- source3/script/installman.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/script/installman.sh') diff --git a/source3/script/installman.sh b/source3/script/installman.sh index c7a8f45095..d30429d50a 100755 --- a/source3/script/installman.sh +++ b/source3/script/installman.sh @@ -15,7 +15,7 @@ fi for lang in $langs; do - if [ "X$lang" = Xen ]; then + if [ "X$lang" = XC ]; then echo Installing default man pages in $MANDIR/ lang=. else -- cgit From c25a9f4122e0f9d3d54aa92932bdaf6e6f1b5c74 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Mon, 27 Jun 2005 13:20:12 +0000 Subject: r7944: BUG 2808: don't try to install manpages if they are not present (This used to be commit 1ce5cc2a5f3da7ef6874cae5b433c139d68589c6) --- source3/script/installman.sh | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/script/installman.sh') diff --git a/source3/script/installman.sh b/source3/script/installman.sh index d30429d50a..5564ac0231 100755 --- a/source3/script/installman.sh +++ b/source3/script/installman.sh @@ -13,6 +13,10 @@ if [ $# -ge 4 ] ; then GROFF=$4 # sh cmd line, including options fi +if test ! -d docs/manpages; then + echo "No manpages present. SVN development version maybe?" + exit 0 +fi for lang in $langs; do if [ "X$lang" = XC ]; then -- cgit From 1d4eb573239224b2886d1e066d544af31c29ce1f Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Tue, 12 Jul 2005 17:23:19 +0000 Subject: r8388: fix typo in installman script (This used to be commit 30b03519c0320bdc85ece51aaf814c4b66896df8) --- source3/script/installman.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/script/installman.sh') diff --git a/source3/script/installman.sh b/source3/script/installman.sh index 5564ac0231..9cd9100839 100755 --- a/source3/script/installman.sh +++ b/source3/script/installman.sh @@ -13,7 +13,7 @@ if [ $# -ge 4 ] ; then GROFF=$4 # sh cmd line, including options fi -if test ! -d docs/manpages; then +if test ! -d ../docs/manpages; then echo "No manpages present. SVN development version maybe?" exit 0 fi -- cgit From 54abd2aa66069e6baf7769c496f46d9dba18db39 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 30 Sep 2005 17:13:37 +0000 Subject: r10656: BIG merge from trunk. Features not copied over * \PIPE\unixinfo * winbindd's {group,alias}membership new functions * winbindd's lookupsids() functionality * swat (trunk changes to be reverted as per discussion with Deryck) (This used to be commit 939c3cb5d78e3a2236209b296aa8aba8bdce32d3) --- source3/script/installman.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/script/installman.sh') diff --git a/source3/script/installman.sh b/source3/script/installman.sh index 9cd9100839..5564ac0231 100755 --- a/source3/script/installman.sh +++ b/source3/script/installman.sh @@ -13,7 +13,7 @@ if [ $# -ge 4 ] ; then GROFF=$4 # sh cmd line, including options fi -if test ! -d ../docs/manpages; then +if test ! -d docs/manpages; then echo "No manpages present. SVN development version maybe?" exit 0 fi -- cgit From 75a29f80eb86386c7a320b3ce4d417803ec8910f Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Sat, 1 Oct 2005 19:41:29 +0000 Subject: r10676: reverting bad merge for install manpages script (This used to be commit 50549fa9b3f6d6eaf7da70cb8d7595b32917aade) --- source3/script/installman.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/script/installman.sh') diff --git a/source3/script/installman.sh b/source3/script/installman.sh index 5564ac0231..9cd9100839 100755 --- a/source3/script/installman.sh +++ b/source3/script/installman.sh @@ -13,7 +13,7 @@ if [ $# -ge 4 ] ; then GROFF=$4 # sh cmd line, including options fi -if test ! -d docs/manpages; then +if test ! -d ../docs/manpages; then echo "No manpages present. SVN development version maybe?" exit 0 fi -- cgit From 47e297bc8de7bed9de5fc7ce2456c1d414301eca Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Tue, 11 Oct 2005 16:12:40 +0000 Subject: r10904: build patches from Marc Balmer when builddir!=srcdir (This used to be commit b7fc4045185f2f0ec27aa72656163e9249ad7b85) --- source3/script/installman.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/script/installman.sh') diff --git a/source3/script/installman.sh b/source3/script/installman.sh index 9cd9100839..6278012635 100755 --- a/source3/script/installman.sh +++ b/source3/script/installman.sh @@ -13,7 +13,7 @@ if [ $# -ge 4 ] ; then GROFF=$4 # sh cmd line, including options fi -if test ! -d ../docs/manpages; then +if test ! -d $SRCDIR../docs/manpages; then echo "No manpages present. SVN development version maybe?" exit 0 fi -- cgit From 580ef1f81e8f8ee02a4300366029cedbac65413e Mon Sep 17 00:00:00 2001 From: Lars Müller Date: Thu, 20 Oct 2005 12:58:40 +0000 Subject: r11224: Add feature to get our configuration from config.log into installman.sh. This allows us to install for example smbsh.1 only if SMBWRAPPER is set. Removed also one rm call as we copy and do not append to the same file in the next step. There is no file permission risk as we chmod 0644 in any case later. Replaced one basename call by shell substitution. (This used to be commit 3944dfbff4f7f951d35e7893f7ab56ed2e9d76b0) --- source3/script/installman.sh | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'source3/script/installman.sh') diff --git a/source3/script/installman.sh b/source3/script/installman.sh index 6278012635..e9b068a9f6 100755 --- a/source3/script/installman.sh +++ b/source3/script/installman.sh @@ -18,6 +18,10 @@ if test ! -d $SRCDIR../docs/manpages; then exit 0 fi +# Get the configured feature set +test -f config.log && \ + eval $( grep "^[[:alnum:]]*=.*" config.log) + for lang in $langs; do if [ "X$lang" = XC ]; then echo Installing default man pages in $MANDIR/ @@ -40,13 +44,20 @@ for lang in $langs; do for sect in 1 5 7 8 ; do for m in $langdir/man$sect ; do for s in $SRCDIR../docs/manpages/$lang/*$sect; do - FNAME=$m/`basename $s` - + MP_BASENAME=${s##*/} + + # Check if this man page if required by the configured feature set + case "${MP_BASENAME}" in + smbsh.1) test -z "${SMBWRAPPER}" && continue ;; + *) ;; + esac + + FNAME="$m/${MP_BASENAME}" + # Test for writability. Involves # blowing away existing files. if (rm -f $FNAME && touch $FNAME); then - rm $FNAME if [ "x$GROFF" = x ] ; then cp $s $m # Copy raw nroff else -- cgit From f8cb37ab19cc9499c23a1e1f40427ed48b707870 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 11 Nov 2005 21:11:33 +0000 Subject: r11685: reverting Lar's change to nistallman from r11224 since it breaks 'make installman' outside the source tree; will fix up after the rc1 release (This used to be commit 61e7366e0f545e8ef1aad45a3ab3f6aac1ca6049) --- source3/script/installman.sh | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'source3/script/installman.sh') diff --git a/source3/script/installman.sh b/source3/script/installman.sh index e9b068a9f6..6278012635 100755 --- a/source3/script/installman.sh +++ b/source3/script/installman.sh @@ -18,10 +18,6 @@ if test ! -d $SRCDIR../docs/manpages; then exit 0 fi -# Get the configured feature set -test -f config.log && \ - eval $( grep "^[[:alnum:]]*=.*" config.log) - for lang in $langs; do if [ "X$lang" = XC ]; then echo Installing default man pages in $MANDIR/ @@ -44,20 +40,13 @@ for lang in $langs; do for sect in 1 5 7 8 ; do for m in $langdir/man$sect ; do for s in $SRCDIR../docs/manpages/$lang/*$sect; do - MP_BASENAME=${s##*/} - - # Check if this man page if required by the configured feature set - case "${MP_BASENAME}" in - smbsh.1) test -z "${SMBWRAPPER}" && continue ;; - *) ;; - esac - - FNAME="$m/${MP_BASENAME}" - + FNAME=$m/`basename $s` + # Test for writability. Involves # blowing away existing files. if (rm -f $FNAME && touch $FNAME); then + rm $FNAME if [ "x$GROFF" = x ] ; then cp $s $m # Copy raw nroff else -- cgit From ba2edc38aa6bce492817b395f196d3d2f2f0bda9 Mon Sep 17 00:00:00 2001 From: Lars Müller Date: Mon, 14 Nov 2005 21:18:09 +0000 Subject: r11728: Ensure to check for the config.log in ${SRCDIR}. Revert jerry's revert from 11685. :) At the moment I don't see a way to check if there is an empty ${SMBWRAPPER} or none. If there is a way to check if ${SMBWRAPPER} isn't set at all we could make the installman script even work if config.log does not exist. (This used to be commit 3e3113a1fab282c0f652340d1027bb614ef93ec3) --- source3/script/installman.sh | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'source3/script/installman.sh') diff --git a/source3/script/installman.sh b/source3/script/installman.sh index 6278012635..3bbca1a8aa 100755 --- a/source3/script/installman.sh +++ b/source3/script/installman.sh @@ -18,6 +18,10 @@ if test ! -d $SRCDIR../docs/manpages; then exit 0 fi +# Get the configured feature set +test -f "${SRCDIR}/config.log" && \ + eval $( grep "^[[:alnum:]]*=.*" "${SRCDIR}/config.log") + for lang in $langs; do if [ "X$lang" = XC ]; then echo Installing default man pages in $MANDIR/ @@ -40,13 +44,20 @@ for lang in $langs; do for sect in 1 5 7 8 ; do for m in $langdir/man$sect ; do for s in $SRCDIR../docs/manpages/$lang/*$sect; do - FNAME=$m/`basename $s` - + MP_BASENAME=${s##*/} + + # Check if this man page if required by the configured feature set + case "${MP_BASENAME}" in + smbsh.1) test -z "${SMBWRAPPER}" && continue ;; + *) ;; + esac + + FNAME="$m/${MP_BASENAME}" + # Test for writability. Involves # blowing away existing files. if (rm -f $FNAME && touch $FNAME); then - rm $FNAME if [ "x$GROFF" = x ] ; then cp $s $m # Copy raw nroff else -- cgit From 03b77baa6f20b8eaa450e67b0e0e1ad6f5b686be Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Sat, 3 Dec 2005 01:03:16 +0000 Subject: r12040: merging packaging fixes from release branch (This used to be commit 47a9f2c3d6039a07a6970ac181aeb2888d47a353) --- source3/script/installman.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'source3/script/installman.sh') diff --git a/source3/script/installman.sh b/source3/script/installman.sh index 3bbca1a8aa..9235217ff0 100755 --- a/source3/script/installman.sh +++ b/source3/script/installman.sh @@ -19,8 +19,7 @@ if test ! -d $SRCDIR../docs/manpages; then fi # Get the configured feature set -test -f "${SRCDIR}/config.log" && \ - eval $( grep "^[[:alnum:]]*=.*" "${SRCDIR}/config.log") +test -f "${SRCDIR}/config.log" && eval `grep '^[A-Za-z0-9]*=.*' ${SRCDIR}/config.log` for lang in $langs; do if [ "X$lang" = XC ]; then @@ -44,7 +43,7 @@ for lang in $langs; do for sect in 1 5 7 8 ; do for m in $langdir/man$sect ; do for s in $SRCDIR../docs/manpages/$lang/*$sect; do - MP_BASENAME=${s##*/} + MP_BASENAME=`basename $s` # Check if this man page if required by the configured feature set case "${MP_BASENAME}" in -- cgit From 0af1500fc0bafe61019f1b2ab1d9e1d369221240 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 3 Feb 2006 22:19:41 +0000 Subject: r13316: Let the carnage begin.... Sync with trunk as off r13315 (This used to be commit 17e63ac4ed8325c0d44fe62b2442449f3298559f) --- source3/script/installman.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'source3/script/installman.sh') diff --git a/source3/script/installman.sh b/source3/script/installman.sh index 9235217ff0..3bbca1a8aa 100755 --- a/source3/script/installman.sh +++ b/source3/script/installman.sh @@ -19,7 +19,8 @@ if test ! -d $SRCDIR../docs/manpages; then fi # Get the configured feature set -test -f "${SRCDIR}/config.log" && eval `grep '^[A-Za-z0-9]*=.*' ${SRCDIR}/config.log` +test -f "${SRCDIR}/config.log" && \ + eval $( grep "^[[:alnum:]]*=.*" "${SRCDIR}/config.log") for lang in $langs; do if [ "X$lang" = XC ]; then @@ -43,7 +44,7 @@ for lang in $langs; do for sect in 1 5 7 8 ; do for m in $langdir/man$sect ; do for s in $SRCDIR../docs/manpages/$lang/*$sect; do - MP_BASENAME=`basename $s` + MP_BASENAME=${s##*/} # Check if this man page if required by the configured feature set case "${MP_BASENAME}" in -- cgit From 7112413350938e8e0dcdc0ac2ec845e65a379b49 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 9 Jun 2006 21:57:42 +0000 Subject: r16130: fix a shell portability issue for Solaris sh in installman.sh (This used to be commit 9be3e07884e7f8121bc64766e7d036495cd94a15) --- source3/script/installman.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/script/installman.sh') diff --git a/source3/script/installman.sh b/source3/script/installman.sh index 3bbca1a8aa..869ce6ee38 100755 --- a/source3/script/installman.sh +++ b/source3/script/installman.sh @@ -20,7 +20,7 @@ fi # Get the configured feature set test -f "${SRCDIR}/config.log" && \ - eval $( grep "^[[:alnum:]]*=.*" "${SRCDIR}/config.log") + eval `grep "^[[:alnum:]]*=.*" "${SRCDIR}/config.log"` for lang in $langs; do if [ "X$lang" = XC ]; then @@ -44,7 +44,7 @@ for lang in $langs; do for sect in 1 5 7 8 ; do for m in $langdir/man$sect ; do for s in $SRCDIR../docs/manpages/$lang/*$sect; do - MP_BASENAME=${s##*/} + MP_BASENAME=`basename $s` # Check if this man page if required by the configured feature set case "${MP_BASENAME}" in -- cgit From 83a41eb3a716045bbf283d155b0a605ce7964bf7 Mon Sep 17 00:00:00 2001 From: Lars Müller Date: Wed, 10 Jan 2007 19:16:59 +0000 Subject: r20663: Do not install smbmount man page if we didn't called configure --with-smbmount. (This used to be commit ee12348cf1e93d0e75714f3883bfea6525797dc1) --- source3/script/installman.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/script/installman.sh') diff --git a/source3/script/installman.sh b/source3/script/installman.sh index 869ce6ee38..b879c79022 100755 --- a/source3/script/installman.sh +++ b/source3/script/installman.sh @@ -49,6 +49,7 @@ for lang in $langs; do # Check if this man page if required by the configured feature set case "${MP_BASENAME}" in smbsh.1) test -z "${SMBWRAPPER}" && continue ;; + smbmount.8) test -z "${SMBMOUNT_PROGS}" && continue ;; *) ;; esac -- cgit From 1e8cbe46e0c59b65f15c225a43fb64a1a5a69cfc Mon Sep 17 00:00:00 2001 From: Lars Müller Date: Wed, 10 Jan 2007 20:08:25 +0000 Subject: r20666: Also do not install the smbmnt man page if SMBMOUNT_PROGS is not set. (This used to be commit aa122be8f7a33ebceeb43e4f0c5362047560b199) --- source3/script/installman.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/script/installman.sh') diff --git a/source3/script/installman.sh b/source3/script/installman.sh index b879c79022..2bb490f011 100755 --- a/source3/script/installman.sh +++ b/source3/script/installman.sh @@ -49,7 +49,7 @@ for lang in $langs; do # Check if this man page if required by the configured feature set case "${MP_BASENAME}" in smbsh.1) test -z "${SMBWRAPPER}" && continue ;; - smbmount.8) test -z "${SMBMOUNT_PROGS}" && continue ;; + smbmnt.8|smbmount.8) test -z "${SMBMOUNT_PROGS}" && continue ;; *) ;; esac -- cgit From c7f59d48c16d5c64d70b9c5224b7171b4cbc4b5e Mon Sep 17 00:00:00 2001 From: Lars Müller Date: Wed, 10 Jan 2007 21:46:39 +0000 Subject: r20668: Also do not install the smbumount man page if we don't build smbumount. (This used to be commit 82ce272b2464f06e8bcbed6452621daa05e12b5d) --- source3/script/installman.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/script/installman.sh') diff --git a/source3/script/installman.sh b/source3/script/installman.sh index 2bb490f011..7edc707ab0 100755 --- a/source3/script/installman.sh +++ b/source3/script/installman.sh @@ -49,7 +49,7 @@ for lang in $langs; do # Check if this man page if required by the configured feature set case "${MP_BASENAME}" in smbsh.1) test -z "${SMBWRAPPER}" && continue ;; - smbmnt.8|smbmount.8) test -z "${SMBMOUNT_PROGS}" && continue ;; + smbmnt.8|smbmount.8|smbumount.8) test -z "${SMBMOUNT_PROGS}" && continue ;; *) ;; esac -- cgit From e1b32594c70ee57f16c84adb7910aa5c84a560f8 Mon Sep 17 00:00:00 2001 From: Karolin Seeger Date: Thu, 28 Feb 2008 15:49:57 +0100 Subject: Remove smbmount. Karolin (This used to be commit 5fbd98f7065268ae134108310119078ad8f62322) --- source3/script/installman.sh | 1 - 1 file changed, 1 deletion(-) (limited to 'source3/script/installman.sh') diff --git a/source3/script/installman.sh b/source3/script/installman.sh index 7edc707ab0..869ce6ee38 100755 --- a/source3/script/installman.sh +++ b/source3/script/installman.sh @@ -49,7 +49,6 @@ for lang in $langs; do # Check if this man page if required by the configured feature set case "${MP_BASENAME}" in smbsh.1) test -z "${SMBWRAPPER}" && continue ;; - smbmnt.8|smbmount.8|smbumount.8) test -z "${SMBMOUNT_PROGS}" && continue ;; *) ;; esac -- cgit From 99e73df8e81492c3545e93c4fec1cd3c5320f0b4 Mon Sep 17 00:00:00 2001 From: Karolin Seeger Date: Tue, 17 Jun 2008 10:36:51 +0200 Subject: Remove references to SVN. Karolin (This used to be commit 9d69a809e370f98057e514a3c755b0b86ee5f610) --- source3/script/installman.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/script/installman.sh') diff --git a/source3/script/installman.sh b/source3/script/installman.sh index 869ce6ee38..ab9bfe506d 100755 --- a/source3/script/installman.sh +++ b/source3/script/installman.sh @@ -14,7 +14,7 @@ if [ $# -ge 4 ] ; then fi if test ! -d $SRCDIR../docs/manpages; then - echo "No manpages present. SVN development version maybe?" + echo "No manpages present. Development version maybe?" exit 0 fi -- cgit