Merge branch 'maint'

diff --git a/Makefile b/Makefile
index 1cc6c6087b530c3b584631a3d19447a4d63f4a99..654d8ac7e14a2118b1fd2014fb13a6b5d4c50c64 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1049,6 +1049,7 @@ ifeq ($(uname_S),HP-UX)
        NO_UNSETENV = YesPlease
        NO_HSTRERROR = YesPlease
        NO_SYS_SELECT_H = YesPlease
+       NO_FNMATCH_CASEFOLD = YesPlease
        SNPRINTF_RETURNS_BOGUS = YesPlease
        NO_NSEC = YesPlease
        ifeq ($(uname_R),B.11.00)
@@ -2340,6 +2341,7 @@ dist-doc:
 
 distclean: clean
        $(RM) configure
+       $(RM) po/git.pot
 
 clean:
        $(RM) *.o block-sha1/*.o ppc/*.o compat/*.o compat/*/*.o xdiff/*.o vcs-svn/*.o \