From mboxrd@z Thu Jan 1 00:00:00 1970 From: Miloslav Trmac Subject: Re: [PATCH] dist target fixes Date: Mon, 30 Jul 2007 16:32:12 +0200 Message-ID: <46ADF66C.4080805@redhat.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-audit-bounces@redhat.com Errors-To: linux-audit-bounces@redhat.com To: "John D. Ramsdell" Cc: linux-audit@redhat.com List-Id: linux-audit@redhat.com Hello, John D. Ramsdell napsal(a): > diff -ur a/audit-1.5.6/Makefile.am b/audit-1.5.6/Makefile.am > --- a/audit-1.5.6/Makefile.am 2007-06-27 06:19:18.000000000 -0400 > +++ b/audit-1.5.6/Makefile.am 2007-07-30 07:53:45.000000000 -0400 > @@ -21,9 +21,14 @@ > # Rickard E. (Rik) Faith > # > > -SUBDIRS = lib auparse src/mt src audisp swig bindings init.d docs system-config-audit > -EXTRA_DIST = ChangeLog AUTHORS NEWS README sample.rules contrib/capp.rules contrib/nispom.rules contrib/lspp.rules contrib/skeleton.c README-install audit.spec > -CONFIG_CLEAN_FILES = Makefile.in aclocal.m4* config.h.* configure debug*.list config/* > +SUBDIRS = lib auparse src/mt src audisp swig bindings init.d docs \ > +system-config-audit > +EXTRA_DIST = ChangeLog AUTHORS NEWS README sample.rules \ > +contrib/capp.rules contrib/nispom.rules contrib/lspp.rules \ > +contrib/skeleton.c contrib/avc_snap contrib/avc_syslog \ > +system-config-audit.lang README-install audit.spec system-config-audit.lang is generated by %install when building the rpm, and should not be in the tarball at all. > diff -ur a/audit-1.5.6/system-config-audit/Makefile.am b/audit-1.5.6/system-config-audit/Makefile.am > --- a/audit-1.5.6/system-config-audit/Makefile.am 2007-07-25 14:25:05.000000000 -0400 > +++ b/audit-1.5.6/system-config-audit/Makefile.am 2007-07-30 07:49:09.000000000 -0400 > @@ -58,11 +58,21 @@ > CLEANFILES = $(applications_DATA) $(bin_SCRIPTS) $(nodist_pkgdata_PYTHON) \ > admin/system-config-audit-server.console > DISTCLEANFILES = intltool-extract intltool-merge intltool-update > -EXTRA_DIST = admin/intltool-extract.in admin/intltool-merge.in \ > - admin/intltool-update.in admin/system-config-audit-server.console.in \ > - admin/system-config-audit-server.pam \ > - src/settings.py.in src/system-config-audit.in \ > - system-config-audit.desktop.in > +EXTRA_DIST = admin/intltool-extract.in admin/intltool-merge.in \ > + admin/intltool-update.in \ > + admin/system-config-audit-server.console.in \ > + admin/system-config-audit-server.pam src/settings.py.in \ > + src/system-config-audit.in system-config-audit.desktop.in \ > + m4/codeset.m4 m4/gettext.m4 m4/glibc21.m4 m4/glibc2.m4 \ > + m4/iconv.m4 m4/intdiv0.m4 m4/intldir.m4 m4/intl.m4 \ > + m4/intmax.m4 m4/inttypes_h.m4 m4/inttypes.m4 \ > + m4/inttypes-pri.m4 m4/isc-posix.m4 m4/lcmessage.m4 \ > + m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4 m4/lock.m4 \ > + m4/longdouble.m4 m4/longlong.m4 m4/nls.m4 m4/po.m4 \ > + m4/printf-posix.m4 m4/progtest.m4 m4/signed.m4 m4/size_max.m4 \ > + m4/stdint_h.m4 m4/uintmax_t.m4 m4/ulonglong.m4 \ > + m4/visibility.m4 m4/wchar_t.m4 m4/wint_t.m4 m4/xsize.m4 A better solution is to change s-c-audit/autogen.sh (and to distribute the autogen.sh files): diff -urN audit-1.5.6/system-config-audit/autogen.sh audit/system-config-audit/autogen.sh --- audit-1.5.6/system-config-audit/autogen.sh 2007-06-27 12:44:22.000000000 +0200 +++ audit/system-config-audit/autogen.sh 2007-07-30 16:21:05.000000000 +0200 @@ -6,7 +6,7 @@ intltoolize --force rm admin/po -aclocal +aclocal -I m4 autoconf -Wall autoheader -Wall automake -Wall --add-missing This will add only the .m4 files that are used by system-config-audit to the tarball, not all .m4 files provided by gettext. Mirek