Makefile fixes for make distcheck

David Shea dshea at redhat.com
Fri Nov 8 14:57:27 UTC 2013


distcheck is one of the targets generated by automake, and it can be pretty
handy: it creates the distribution tarball, unpacks, and then tries to build,
check, install, uninstall, and clean the distribution.

The first three patches fix legit problems: we weren't including some files
in the distribution, we weren't cleanup up after intltool, and make uninstall
was broken. The fourth patch just adds --enable-gtk-doc to the configure
arguments automake uses in the unpacked distribution, since we can't enable
that by default. 

The fifth patch ensures that all of our install paths start with $prefix. This
one seems kind of silly, since we really do want files specifically in /etc and
/usr/lib sometimes, but make distcheck uses --prefix instead of DESTDIR for
some reason. The %configure macro in the spec file includes all of the autoconf
macros that turn $prefix-based directories into real directories, so whatever,
we can play this their way.

Patches six and seven are for gettext. Six updates our required gettext
version to 0.18.3, which lets us use gettext to directly process glade files
instead of pre-processing them with intltool. This makes things better! Seven
adds the remaining pre-processed outputs to the distribution. This makes things
worse :-( The problem is that make distcheck does a VPATH build in such a way
that the original $srcdirs are unwritable, and gettext insists that these
generated files be in $srcdir instead of $builddir. The solution is to ensure
that gettext doesn't have to generate the files.

Anyway, make distcheck works again. Gonna get this stuff right one of these
days.


More information about the anaconda-patches mailing list