From 290aa6ca2e22201c63abc8d3628fff7a34afbb2f Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Tue, 18 Oct 2005 17:20:50 +0000
Subject: [PATCH] r11152: fix some regressions caused by the trunk->3.0 merge
 when install docs with SWAT

---
 packaging/RedHat/samba.spec.tmpl | 4 +---
 source/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 a4718e027b9..a6ab5467a40 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/source/script/installswat.sh b/source/script/installswat.sh
index cba3a294f87..c5c285894e7 100755
--- a/source/script/installswat.sh
+++ b/source/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
-- 
2.11.4.GIT