From 1e5a791a224db14719e19e33ffa007ab8d8e8adf Mon Sep 17 00:00:00 2001 From: Micah Cowan Date: Mon, 7 Sep 2009 21:10:05 -0700 Subject: [PATCH] Make distcheck pass. --- ChangeLog | 10 ++++++++++ Makefile.am | 7 +++++++ po/Rules-quot | 6 ++++-- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0ee1e0bb..f2a04de7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2009-09-07 Micah Cowan + + * Makefile.am (distuninstallcheck_listfiles): Don't complain if + /usr/share/info/dir and /etc/wgetrc are left behind after an + uninstall. + + * po/Rules-quot (mostlyclean-quot): Add en_US.po for remvoal by + mostlyclean. + (en_US.po-update): Behave properly for VPATH builds. + 2009-09-05 Micah Cowan * configure.ac: If we can't find idna.h, check to see if it's diff --git a/Makefile.am b/Makefile.am index 3ae3c606..27b43549 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,6 +30,13 @@ # Version: @VERSION@ # + +# We can't help that installing wget.info leaves /usr/share/info/dir +# around, and we need to prevent uninstallation of the possibly +# previously-existing /etc/wgetrc. +distuninstallcheck_listfiles = find . -type f | \ + grep -Ev '(/share/info/dir|/etc/wgetrc)$$' + # Search for macros in the m4 subdirectory: ACLOCAL_AMFLAGS = -I m4 -I md5/m4 diff --git a/po/Rules-quot b/po/Rules-quot index a38a2bed..8ec55e55 100644 --- a/po/Rules-quot +++ b/po/Rules-quot @@ -49,9 +49,11 @@ en@boldquot.insert-header: insert-header.sin mostlyclean: mostlyclean-quot mostlyclean-quot: - rm -f *.insert-header + rm -f *.insert-header en_US.po en_US.po: en_US.po-update en_US.po-update: en@quot.po - cp en@quot.po en_US.po + if test -r en@quot.po; then realcat=en@quot.po; \ + else realcat=$(srcdir)/en@quot.po; fi; \ + cp $$realcat en_US.po -- 2.39.2