Blob Blame Raw
--- setools-2.2/seaudit/Makefile.rhat	2005-10-28 18:12:32.000000000 -0400
+++ setools-2.2/seaudit/Makefile	2005-11-03 17:11:31.000000000 -0500
@@ -60,8 +60,8 @@
 	$(CC) $(CFLAGS) $(GTK_CFLAGS) $(LIBXML_FLAGS) $(INCLUDE) -c $<
 
 install: seaudit seaudit-report
-	install -m 755 seaudit $(BINDIR)
-	install -m 755 seaudit-report $(BINDIR)
+	install -m 755 seaudit $(SBINDIR)
+	install -m 755 seaudit-report $(SBINDIR)
 	install -m 644 $(GLADE_FILES) $(INSTALL_LIBDIR)
 	install -m 644 seaudit_help.txt $(INSTALL_LIBDIR)
 	install -m 444 dot_seaudit $(INSTALL_LIBDIR)
--- setools-2.2/apol/Makefile.rhat	2005-10-28 18:12:32.000000000 -0400
+++ setools-2.2/apol/Makefile	2005-11-03 17:11:31.000000000 -0500
@@ -80,7 +80,7 @@
 	$(MAKE) -C .. libsefs
 
 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 \
@@ -89,6 +89,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-2.2/Makefile.rhat	2005-10-28 18:12:32.000000000 -0400
+++ setools-2.2/Makefile	2005-11-03 17:15:11.000000000 -0500
@@ -10,7 +10,7 @@
 LIBS			= -lfl -lm
 
 INCLUDE_DIR		= $(DESTDIR)/usr/include
-SHARED_LIB_INSTALL_DIR 	= $(DESTDIR)/usr/lib
+SHARED_LIB_INSTALL_DIR 	= $(DESTDIR)$(LIBDIR)
 STATIC_LIB_INSTALL_DIR 	= $(SHARED_LIB_INSTALL_DIR)
 SETOOLS_INCLUDE 	= $(INCLUDE_DIR)/setools
 TCLVER			= $(shell env tclsh tcl_vars)
@@ -28,6 +28,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 
 # a trailing path seperator ("/"). For example, use "/usr/share/setools" 
 # instead of "/usr/share/setools/". This probably needs to become more 
--- setools-2.2/sediff/Makefile.rhat	2005-10-28 18:12:32.000000000 -0400
+++ setools-2.2/sediff/Makefile	2005-11-03 17:11:31.000000000 -0500
@@ -24,7 +24,8 @@
 	install -m 755 sediff $(BINDIR);
 	
 install: all
-	install -m 755 sediff sediffx $(BINDIR);
+	install -m 755 sediff $(BINDIR);
+	install -m 755 sediffx $(SBINDIR);
 	install -m 644 $(GLADE_FILES) $(INSTALL_LIBDIR)
 	install -m 644 sediff_help.txt $(INSTALL_LIBDIR)