--- setools-1.4.1/apol/Makefile.rhat	2004-07-07 16:37:38.000000000 -0400
+++ setools-1.4.1/apol/Makefile	2004-09-17 14:55:59.906697348 -0400
@@ -17,7 +17,7 @@
 CFLAGS          += -DSTARTUP_SCRIPT='"$(APOL_STARTUP_SCRIPT)"'
 
 apol: $(GUI-OBJ) apol.tcl
-	$(CC) $(TCL_LIBINC) -o $@ $(GUI-OBJ) $(LINKFLAGS) $(TCL_LIBS)
+	$(CC) $(TCL_LIBINC) -o $@ $(GUI-OBJ) $(LINKFLAGS) $(TCL_LIBS) -lselinux
 
 
 apol.tcl: $(TCL-FILES)
@@ -45,7 +45,7 @@
 
 
 install: apol apol.tcl
-	install -m 755 apol $(BINDIR)
+	install -m 755 apol $(SBINDIR)
 	@if [ -n $(INSTALL_LIBDIR) ]; then \
 		for file in $(TCL-FILES); do \
 			if [ -f $(INSTALL_LIBDIR)/$$file ]; then \
@@ -54,6 +54,7 @@
 		done \
 	fi
 	install -m 644 apol.tcl $(APOL_HELP_FILES) $(APOL_PERM_MAPS) $(INSTALL_LIBDIR)
+	install -m 644 $(APOL_HELP_FILES) $(APOL_PERM_MAPS) ${INSTALL_HELPDIR}
 	cd $(INSTALL_LIBDIR); ln -sf $(APOL_DFLT_PMAP) apol_perm_mapping
 
 clean:
--- setools-1.4.1/seaudit/Makefile.rhat	2004-07-07 16:37:39.000000000 -0400
+++ setools-1.4.1/seaudit/Makefile	2004-09-17 14:53:57.182637843 -0400
@@ -22,7 +22,7 @@
 	$(CC) $(CFLAGS) $(GTK_CFLAGS) $(INCLUDE) -c $<
 
 install: seaudit
-	install -m 755 seaudit $(BINDIR)
+	install -m 755 seaudit $(SBINDIR)
 	install -m 644 $(GLADE_FILES) $(INSTALL_LIBDIR)
 	install -m 644 seaudit_help.txt  $(INSTALL_LIBDIR)
 	install -m 444 dot_seaudit $(INSTALL_LIBDIR)
--- setools-1.4.1/Makefile.rhat	2004-07-07 16:37:39.000000000 -0400
+++ setools-1.4.1/Makefile	2004-09-17 15:02:24.825557300 -0400
@@ -25,8 +25,8 @@
 # File location defaults; used in various places in code
 # Change these if you want different defaults
 SELINUX_DIR = $(DESTDIR)/selinux
-SELINUX_POLICY_DIR = $(DESTDIR)/etc/security/selinux
-POLICY_INSTALL_DIR = $(DESTDIR)$(SELINUX_POLICY_DIR)
+SELINUX_POLICY_DIR = $(DESTDIR)/etc/selinux/strict/
+POLICY_INSTALL_DIR = $(DESTDIR)$(SELINUX_POLICY_DIR)/policy
 POLICY_SRC_DIR	= $(DESTDIR)$(SELINUX_POLICY_DIR)/src/policy
 POLICY_SRC_FILE = $(POLICY_SRC_DIR)/policy.conf
 DEFAULT_LOG_FILE = /var/log/messages
@@ -46,6 +46,7 @@
 # Install directories
 # Binaries go here
 BINDIR		= $(DESTDIR)/usr/bin
+SBINDIR		= $(DESTDIR)/usr/sbin
 
 
 # The code uses the specified path below. If you change this, DO NOT add 
@@ -66,7 +67,7 @@
 POLICYINSTALLDIRS = seuser
 
 # exports
-export CFLAGS CC YACC LEX LINKFLAGS BINDIR INSTALL_LIBDIR INSTALL_HELPDIR LIBS TCL_LIBINC TCL_LIBS MAKE 
+export CFLAGS CC YACC LEX LINKFLAGS BINDIR SBINDIR INSTALL_LIBDIR INSTALL_HELPDIR LIBS TCL_LIBINC TCL_LIBS MAKE 
 export SELINUX_DIR POLICY_INSTALL_DIR POLICY_SRC_DIR SRC_POLICY_DIR POLICY_SRC_FILE DEFAULT_LOG_FILE
 export SHARED_LIB_INSTALL_DIR STATIC_LIB_INSTALL_DIR SETOOLS_INCLUDE
 
@@ -224,7 +225,7 @@
 
 install-nogui: $(INSTALL_LIBDIR) install-seuser install-secmds
 
-install: install-apol install-seuserx install-sepcut install-awish install-secmds install-seaudit
+install: install-apol install-seuserx install-sepcut install-awish install-secmds install-seaudit install-bwidget install-docs
 
 # Install the libraries
 install-libseuser:
--- setools-1.4.1/packages/Makefile.rhat	2004-07-07 16:37:38.000000000 -0400
+++ setools-1.4.1/packages/Makefile	2004-09-17 14:38:28.803731785 -0400
@@ -4,9 +4,10 @@
 
 # INSTALL_PATH is set based upon your current 
 # version of tcl using the tcl_vars script.
-INSTALL_PATH=$(shell env tclsh ../tcl_vars tcl_library)
+INSTALL_PATH=$(DESTDIR)/$(shell env tclsh ../tcl_vars tcl_library)
 
 install:
+	mkdir -p $(INSTALL_PATH)	
 	tar -zxvf BWidget-1.4.1.tar.gz
 	mv BWidget-1.4.1 $(INSTALL_PATH)
 
@@ -19,4 +20,4 @@
 clean:
 	rm -rf BWidget-1.4.1/
 
-bare:	clean
\ No newline at end of file
+bare:	clean
--- setools-1.4.1/libseuser/seuser_db.c.rhat	2004-07-07 16:37:39.000000000 -0400
+++ setools-1.4.1/libseuser/seuser_db.c	2004-09-17 14:38:28.800732121 -0400
@@ -17,8 +17,15 @@
 #include <pwd.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <limits.h>
 #include "seuser_db.h"
 
+/* 
+   defined in selinux/selinux.h
+   but conflicts with policy.h
+*/
+extern char *selinux_file_context_path(void);
+
 /* apol lib */
 #include "../libapol/policy.h"
 #include "../libapol/policy-io.h"
@@ -789,8 +796,10 @@
 	}	
 	free(full_config);
 	
-	
-	db->policy_conf = get_config_var("policy.conf", fp);
+	/*	db->policy_conf = get_config_var("policy.conf", fp);*/
+	db->policy_conf = malloc(PATH_MAX);
+	snprintf(db->policy_conf, PATH_MAX, "%s/src/policy/policy.conf", 
+		 selinux_policy_root());
 	if(db->policy_conf == NULL) {
 		fclose(fp);
 		free_conf_info(db);
@@ -805,7 +814,9 @@
 		return 4;
      	}
      			
-	db->policy_dir = get_config_var("policy_dir", fp);
+	/*	db->policy_dir = get_config_var("policy_dir", fp);*/
+	db->policy_dir = malloc(PATH_MAX);
+	snprintf(db->policy_dir, PATH_MAX, "%s/src/policy", selinux_policy_root());
 	if(db->policy_dir == NULL) {
 		fclose(fp);
 		free_conf_info(db);
@@ -820,7 +831,9 @@
 		return 6;
      	}  
      	   	
-     	db->user_file = get_config_var("user_file", fp);
+	/*     	db->user_file = get_config_var("user_file", fp);*/
+	db->user_file = malloc(PATH_MAX);
+	snprintf(db->user_file, PATH_MAX, "%s/src/policy/users", selinux_policy_root());
      	if(db->user_file == NULL) {
      		fclose(fp);
 		free_conf_info(db);
@@ -829,7 +842,8 @@
      	}
 	/* users file may not exist which is ok, so we won't check read access. */  
 		
-	db->file_contexts_file = get_config_var("file_contexts_file", fp);
+	/*	db->file_contexts_file = get_config_var("file_contexts_file", fp);*/
+	db->file_contexts_file = strdup(selinux_file_context_path());
 	if(db->file_contexts_file == NULL) {
 		fclose(fp);
 		free_conf_info(db);
--- setools-1.4.1/libseuser/Makefile.rhat	2004-07-07 16:37:38.000000000 -0400
+++ setools-1.4.1/libseuser/Makefile	2004-09-17 14:38:28.800732121 -0400
@@ -19,7 +19,7 @@
 	$(CC) $(LDFLAGS) -shared -o $(LIBSO) $(LIB-OBJ) -Wl,-soname,$(SONAME)
 	
 libseuser.a: $(LIB-OBJ) 
-	 ar cr $@ $(LIB-OBJ) 
+	 ar cr $@ $(LIB-OBJ) -lselinux
 	 
 libseuser-tcl.a: $(LIB-OBJ-TCL) 
 	 ar cr $@ $(LIB-OBJ-TCL)
--- setools-1.4.1/seuser/Makefile.rhat	2004-07-07 16:37:39.000000000 -0400
+++ setools-1.4.1/seuser/Makefile	2004-09-17 14:55:34.387595850 -0400
@@ -22,10 +22,10 @@
 SHELL = /bin/sh
 
 seuser: $(CMD-OBJ) 
-	$(CC) -o $@ $(CMD-OBJ) $(LINKFLAGS) $(LIBS)
+	$(CC) -o $@ $(CMD-OBJ) $(LINKFLAGS) $(LIBS) -lselinux
 
 seuserx: $(GUI-OBJ) se_user.tcl
-	$(CC) $(GUI_CFLAGS) $(TCL_LIBINC) -o $@ $(GUI-OBJ) $(LINKFLAGS) $(TCL_LIBS)
+	$(CC) $(GUI_CFLAGS) $(TCL_LIBINC) -o $@ $(GUI-OBJ) $(LINKFLAGS) $(TCL_LIBS) -lselinux
 
 se_user.tcl: $(TCL-FILES)
 	cat $(TCL-FILES) | \
@@ -148,7 +148,7 @@
 install: seuser seuserx se_user.tcl
 	install -d $(BINDIR) 
 	install -m 755 seuser $(BINDIR)
-	install -m 755 seuserx $(BINDIR);
+	install -m 755 seuserx $(SBINDIR);
 	install -m 755 $(SE_SHELL_SCRIPTS) $(BINDIR)
 	install -m 644 se_user.tcl $(SEUSER_HELP_FILE) $(INSTALL_LIBDIR)
 	install -m 644 $(SEUSER_CONF_FILE) $(INSTALL_LIBDIR);
--- setools-1.4.1/docs-src/Makefile.rhat	2004-07-07 16:37:39.000000000 -0400
+++ setools-1.4.1/docs-src/Makefile	2004-09-17 14:38:28.805731560 -0400
@@ -55,3 +55,15 @@
 	for file in $(TOP-DOCS); do \
 		rm -f ../$$file; \
 	done
+
+install:
+	mkdir -p ${INSTALL_HELPDIR}
+	for file in KNOWN-BUGS README; do \
+		cat $$file.in | sed -e 's/RELEASE_VERSION/$(shell cat ../VERSION)/g' | \
+		sed -e 's/MOD_DATE/$(shell date '+%B %d, %G')/g' > ${INSTALL_HELPDIR}/$$file; \
+	done 
+	install -m 644 ../seaudit/seaudit_help.txt ${INSTALL_HELPDIR} 
+	install -m 644 ../seuser/seuser_help.txt ${INSTALL_HELPDIR} 
+	install -m 644 ../sepct/sepcut_help.txt ${INSTALL_HELPDIR} 
+	install -m 644 ../apol/*.txt ${INSTALL_HELPDIR} 
+
--- setools-1.4.1/awish/Makefile.rhat	2004-07-07 16:37:39.000000000 -0400
+++ setools-1.4.1/awish/Makefile	2004-09-17 14:38:28.802731897 -0400
@@ -4,7 +4,7 @@
 AWISH_OBJ	= awish.o  $(LIBSEUSER-TCL) $(LIBAPOL-TCL)
 
 awish: $(AWISH_OBJ)
-	$(CC) $(TCL_LIBINC) -o $@ $(AWISH_OBJ) $(LINKFLAGS) $(TCL_LIBS)
+	$(CC) $(TCL_LIBINC) -o $@ $(AWISH_OBJ) $(LINKFLAGS) $(TCL_LIBS) -lselinux
 
 
 %.o:  %.c