diff -Naur audit-1.7.18.orig/audisp/plugins/Makefile.in audit-1.7.18/audisp/plugins/Makefile.in
--- audit-1.7.18.orig/audisp/plugins/Makefile.in	2012-05-17 15:04:04.000000000 -0400
+++ audit-1.7.18/audisp/plugins/Makefile.in	2012-05-17 15:04:54.000000000 -0400
@@ -209,7 +209,7 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 CONFIG_CLEAN_FILES = *.loT *.rej *.orig
-SUBDIRS = builtins zos-remote remote $(am__append_1)
+SUBDIRS = builtins $(am__append_1)
 all: all-recursive
 
 .SUFFIXES:
diff -Naur audit-1.7.18.orig/lib/Makefile.in audit-1.7.18/lib/Makefile.in
--- audit-1.7.18.orig/lib/Makefile.in	2012-05-17 15:04:04.000000000 -0400
+++ audit-1.7.18/lib/Makefile.in	2012-05-17 15:04:18.000000000 -0400
@@ -98,6 +98,7 @@
 	$(libaudit_la_LDFLAGS) $(LDFLAGS) -o $@
 @USE_ALPHA_TRUE@am__EXEEXT_1 = gen_alpha_tables_h$(EXEEXT)
 PROGRAMS = $(noinst_PROGRAMS)
+programs: $(PROGRAMS)
 am_gen_actiontabs_h_OBJECTS = gen_actiontabs_h-gen_tables.$(OBJEXT)
 gen_actiontabs_h_OBJECTS = $(am_gen_actiontabs_h_OBJECTS)
 gen_actiontabs_h_LDADD = $(LDADD)
--- audit-1.7.18/auparse/Makefile.in	2012-05-17 15:08:35.000000000 -0400
+++ audit-1.7.18/auparse/Makefile.in	2012-05-17 15:08:30.000000000 -0400
@@ -93,6 +93,7 @@
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(libauparse_la_LDFLAGS) $(LDFLAGS) -o $@
 PROGRAMS = $(noinst_PROGRAMS)
+programs: $(PROGRAMS)
 am_gen_captabs_h_OBJECTS = gen_captabs_h-gen_tables.$(OBJEXT)
 gen_captabs_h_OBJECTS = $(am_gen_captabs_h_OBJECTS)
 gen_captabs_h_LDADD = $(LDADD)
--- audit-1.7.18/src/Makefile.in	2012-05-17 15:14:44.000000000 -0400
+++ audit-1.7.18/src/Makefile.in	2012-05-17 15:15:10.000000000 -0400
@@ -85,7 +85,7 @@
 am__DEPENDENCIES_1 =
 auditd_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(auditd_CFLAGS) $(CFLAGS) \
-	$(auditd_LDFLAGS) $(LDFLAGS) -o $@
+	$(auditd_LDFLAGS) $(LDFLAGS) -o $@ $(LDADD)
 am_aureport_OBJECTS = aureport.$(OBJEXT) auditd-config.$(OBJEXT) \
 	ausearch-llist.$(OBJEXT) aureport-options.$(OBJEXT) \
 	ausearch-string.$(OBJEXT) ausearch-parse.$(OBJEXT) \
--- audit-1.7.18/Makefile.in	2012-05-17 15:15:49.000000000 -0400
+++ audit-1.7.18/Makefile.in	2012-05-17 15:19:57.000000000 -0400
@@ -223,8 +223,7 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = lib auparse src/mt src/libev src audisp tools swig bindings init.d \
-	docs system-config-audit
+SUBDIRS = lib auparse src/mt src/libev src audisp tools init.d
 
 EXTRA_DIST = ChangeLog AUTHORS NEWS README INSTALL audit.spec \
 	contrib/capp.rules contrib/nispom.rules contrib/lspp.rules \
@@ -234,6 +233,8 @@
 
 CONFIG_CLEAN_FILES = debug*.list config/*
 all: config.h
+	make -C lib programs CC=gcc CFLAGS=
+	make -C auparse programs CC=gcc CFLAGS=
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
--- audit-1.7.18/init.d/Makefile.in	2012-05-17 15:35:38.000000000 -0400
+++ audit-1.7.18/init.d/Makefile.in	2012-05-17 15:35:29.000000000 -0400
@@ -413,12 +413,10 @@
 
 
 install-data-hook:
-	$(INSTALL_DATA) -D -m 640 ${srcdir}/auditd.sysconfig ${DESTDIR}${sysconfigdir}/auditd
 	$(INSTALL_DATA) -D -m 640 ${srcdir}/${libconfig} ${DESTDIR}${sysconfdir}
 	$(INSTALL_DATA) -D -m 640 ${srcdir}/${dispconfig} ${DESTDIR}${dispconfigdir}
 
 install-exec-hook:
-	$(INSTALL_SCRIPT) -D ${srcdir}/auditd.init ${DESTDIR}${initdir}/auditd
 
 uninstall-hook:
 	rm ${DESTDIR}${sysconfigdir}/auditd