Make distcheck pass.

diff --git a/ChangeLog b/ChangeLog
index 0ee1e0bba41182982785c7b86baf25756ff5ee5e..f2a04de79ece33bc2994e96de6c1db34b1c27878 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-09-07  Micah Cowan  <micah@cowan.name>
+
+       * 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  <micah@cowan.name>
 
        * configure.ac: If we can't find idna.h, check to see if it's

diff --git a/Makefile.am b/Makefile.am
index 3ae3c606d3363b9d8cd9c79d583610164a1742c9..27b43549046187e8c306286d0787d79eb57e5fae 100644 (file)
--- 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 a38a2bed8eb53b49a5251ca94e5c01cb698ca686..8ec55e551ab9c7433679b59a1c6580555a1c95c3 100644 (file)
--- 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