--- setools-3.0/Makefile.am.rhat	2006-10-04 12:15:08.000000000 -0400
+++ setools-3.0/Makefile.am	2006-10-26 16:08:20.000000000 -0400
@@ -9,6 +9,7 @@
 SUBDIRS = libqpol libapol libpoldiff libsefs libseaudit secmds sechecker sediff man $(MAYBE_GUI) $(MAYBE_BWIDGET)
 
 EXTRA_DIST = VERSION KNOWN-BUGS
+doc_DATA = KNOWN-BUGS README
 
 libqpol:
 	$(MAKE) -C $(top_srcdir)/libqpol
--- setools-3.0/sechecker/Makefile.am.rhat	2006-10-04 12:14:44.000000000 -0400
+++ setools-3.0/sechecker/Makefile.am	2006-10-26 16:08:20.000000000 -0400
@@ -1,7 +1,7 @@
 setoolsdir = @setoolsdir@
 bin_PROGRAMS = sechecker
 
-dist_setools_DATA = \
+doc_DATA = \
 	sechecker_help.txt
 
 profilesdir = @profile_install_dir@
--- setools-3.0/seaudit/Makefile.am.rhat	2006-10-06 15:14:34.000000000 -0400
+++ setools-3.0/seaudit/Makefile.am	2006-10-26 16:08:20.000000000 -0400
@@ -10,6 +10,9 @@
 	@GTK_LIBS@ @GLADE_LIBS@ @XML_LIBS@ -rdynamic
 LDADD = @SELINUX_LIB_FLAG@ $(top_builddir)/libseaudit/libseaudit.a @APOL_LIB_FLAG@ @QPOL_LIB_FLAG@
 
+doc_DATA = \
+	seaudit_help.txt 
+
 dist_setools_DATA = \
 	customize_filter_window.glade \
 	filter_window.glade \
@@ -18,7 +21,6 @@
 	query_window.glade \
 	report_window.glade \
 	seaudit.glade \
-	seaudit_help.txt \
 	seaudit-report.conf \
 	seaudit-report.css
 
--- setools-3.0/apol/Makefile.am.rhat	2006-10-13 13:56:21.000000000 -0400
+++ setools-3.0/apol/Makefile.am	2006-10-26 16:08:20.000000000 -0400
@@ -4,9 +4,10 @@
 bin_PROGRAMS = apol
 dist_setools_SCRIPTS = apol.tcl
 
-dist_setools_DATA = apol_help.txt domaintrans_help.txt file_relabel_help.txt \
-	infoflow_help.txt types_relation_help.txt \
-	perm_maps/apol_perm_mapping_ver12 \
+doc_DATA = apol_help.txt domaintrans_help.txt file_relabel_help.txt \
+	infoflow_help.txt types_relation_help.txt 
+
+dist_setools_DATA = perm_maps/apol_perm_mapping_ver12 \
 	perm_maps/apol_perm_mapping_ver15 \
 	perm_maps/apol_perm_mapping_ver16 \
 	perm_maps/apol_perm_mapping_ver17 \
--- setools-3.0/packages/Makefile.am.rhat	2006-10-26 16:15:12.000000000 -0400
+++ setools-3.0/packages/Makefile.am	2006-10-26 16:19:41.000000000 -0400
@@ -1,4 +1,4 @@
-bwidget_destdir = @BWIDGET_DESTDIR@
+bwidget_destdir = $(DESTDIR)/@BWIDGET_DESTDIR@
 
 dist_noinst_DATA = BWidget-1.8.0.tar.bz2 combobox.tcl mainframe.tcl notebook.tcl Doxyfile
 
--- setools-3.0/sediff/Makefile.am.rhat	2006-10-04 12:14:48.000000000 -0400
+++ setools-3.0/sediff/Makefile.am	2006-10-26 16:08:20.000000000 -0400
@@ -1,6 +1,7 @@
 setoolsdir = @setoolsdir@
 
-dist_setools_DATA = sediff_help.txt sediff.glade
+doc_DATA = sediff_help.txt
+dist_setools_DATA = sediff.glade
 
 if BUILD_GUI
   MAYBE_SEDIFFX = sediffx
--- setools-3.0/configure.ac.rhat	2006-10-13 14:59:34.000000000 -0400
+++ setools-3.0/configure.ac	2006-10-26 16:18:59.000000000 -0400
@@ -3,6 +3,10 @@
 AC_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(setools, 3.0)
 
+docdir="\${datadir}/doc/$PACKAGE_NAME-$PACKAGE_VERSION"
+AC_SUBST(docdir)
+AC_SUBST(YFLAGS)
+
 dnl *** update these variables as versions change; also update AC_INIT ***
 libqpol_version=1.0.0
 libqpol_soname=libqpol.so.1
@@ -19,7 +23,7 @@
 
 libseaudit_version=3.0.0
 
-setoolsdir='${prefix}/share/setools-3.0'
+setoolsdir='${prefix}/share/setools'
 
 version_min_sepol_major=1
 version_min_sepol_minor=12
@@ -220,7 +224,10 @@
         AC_SUBST(BWIDGET_DESTDIR)
     fi
 else
-    copy_bwidget=no
+
+    BWIDGET_DESTDIR="\${datadir}/tcl8.4/"
+    AC_SUBST(BWIDGET_DESTDIR)
+    copy_bwidget=yes
     bwidget_ver=1.8
 fi
 
@@ -249,17 +256,21 @@
 AC_ARG_WITH(sepol-devel,
             AC_HELP_STRING([--with-sepol-devel],
                            [prefix where sepol development files are installed]),
-            sepol_devel="$withval",
-            sepol_devel="/usr")
+	    sepol_devel_incdir="${withval}/include"
+	    sepol_devel_libdir="${withval}/lib"
+	    ,
+	    sepol_devel_incdir="/usr/include"
+	    sepol_devel_libdir="${libdir}"
+            )
 AC_ARG_WITH(selinux-devel,
             AC_HELP_STRING([--with-selinux-devel],
                            [prefix where SELinux development files are installed]),
-            selinux_devel="$withval",
-            selinux_devel="/usr")
-sepol_devel_incdir="${sepol_devel}/include"
-sepol_devel_libdir="${sepol_devel}/lib"
-selinux_devel_incdir="${selinux_devel}/include"
-selinux_devel_libdir="${selinux_devel}/lib"
+	    selinux_devel_incdir="${withval}/include"
+	    selinux_devel_libdir="${withval}/lib"
+	    ,
+	    selinux_devel_incdir="/usr/include"
+	    selinux_devel_libdir="${libdir}"
+            )
 AC_MSG_CHECKING([for sepol/sepol.h])
 selinux_save_CFLAGS="${CFLAGS}"
 SELINUX_LIB_FLAG="-L${sepol_devel_libdir} -L${selinux_devel_libdir}"