diff options
| author | Gerald Carter <jerry@samba.org> | 2005-10-18 17:20:50 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:05:03 -0500 |
| commit | 63937fec90338fb5affe2d8cb2a568edae320acd (patch) | |
| tree | ddd8eacc8281b4128e7542e445bcf4acb71bc7cd | |
| parent | b39fbaebe8d4af979d2199b65af7ae2a6b1c1971 (diff) | |
| download | samba-63937fec90338fb5affe2d8cb2a568edae320acd.tar.gz samba-63937fec90338fb5affe2d8cb2a568edae320acd.tar.bz2 samba-63937fec90338fb5affe2d8cb2a568edae320acd.zip | |
r11152: fix some regressions caused by the trunk->3.0 merge when install docs with SWAT
(This used to be commit e3c68738663701fde21baef03c36de303e7f1636)
| -rw-r--r-- | packaging/RedHat/samba.spec.tmpl | 4 | ||||
| -rwxr-xr-x | source3/script/installswat.sh | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/packaging/RedHat/samba.spec.tmpl b/packaging/RedHat/samba.spec.tmpl index a4718e027b..a6ab5467a4 100644 --- a/packaging/RedHat/samba.spec.tmpl +++ b/packaging/RedHat/samba.spec.tmpl @@ -114,7 +114,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/samba mkdir -p $RPM_BUILD_ROOT/etc/{logrotate.d,pam.d,samba} mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d mkdir -p $RPM_BUILD_ROOT%{prefix}/{bin,sbin} -mkdir -p $RPM_BUILD_ROOT%{prefix}/share/swat/{images,help,include,using_samba} +mkdir -p $RPM_BUILD_ROOT%{prefix}/share/swat/{help,include,using_samba} mkdir -p $RPM_BUILD_ROOT%{prefix}/share/swat/using_samba/{figs,gifs} mkdir -p $RPM_BUILD_ROOTMANDIR_MACRO mkdir -p $RPM_BUILD_ROOT/var/lib/samba @@ -445,10 +445,8 @@ fi %{prefix}/lib/libsmbclient.a %{prefix}/lib/libsmbclient.so %{prefix}/share/swat/help/* -%{prefix}/share/swat/images/* %{prefix}/share/swat/include/*.html %{prefix}/share/swat/lang/*/help/* -%{prefix}/share/swat/lang/*/images/* %{prefix}/share/swat/using_samba/* %config(noreplace) /etc/samba/lmhosts %config(noreplace) /etc/samba/smb.conf diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh index cba3a294f8..c5c285894e 100755 --- a/source3/script/installswat.sh +++ b/source3/script/installswat.sh @@ -87,7 +87,7 @@ done if [ -d $SRCDIR../docs/htmldocs/ ]; then - for dir in htmldocs/ htmldocs/Samba-HOWTO-Collection htmldocs/Samba-Guide htmldocs/Samba-Developers-Guide + for dir in htmldocs/manpages htmldocs/Samba3-ByExample htmldocs/Samba3-Developers-Guide htmldocs/Samba3-HOWTO do if [ ! -d $SRCDIR../docs/$dir ]; then |