summaryrefslogtreecommitdiff
path: root/m4/install-sh.m4
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2011-04-17 12:00:29 +0200
committerStefano Lattarini <stefano.lattarini@gmail.com>2011-04-17 12:05:46 +0200
commitd583aa66634049d78dc6e04e1774bbb4fe437edc (patch)
treef7516d0d8589efdeb7dc1cc448fd35f8af29cd9d /m4/install-sh.m4
parenteb70ceabcc97910c61a93f6597abb4fba60c1a17 (diff)
parent1cddf4107153300cfb0e321711ddb38eb0d7e96c (diff)
downloadautomake-d583aa66634049d78dc6e04e1774bbb4fe437edc.tar.gz
Merge branch 'maint'
The following additional changes has been made: * m4/amversion.in: Bump serial number from `1' to `8', to avoid potential future conflicts with branch-1.11. * m4/amversion.m4: Likewise. * m4/gcj.m4: Likewise. * m4/python.m4: Likewise. * m4/install-sh.m4: Likewise.
Diffstat (limited to 'm4/install-sh.m4')
-rw-r--r--m4/install-sh.m42
1 files changed, 2 insertions, 0 deletions
diff --git a/m4/install-sh.m4 b/m4/install-sh.m4
index a9b81e0c7..60f17323f 100644
--- a/m4/install-sh.m4
+++ b/m4/install-sh.m4
@@ -6,6 +6,8 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 8
+
# AM_PROG_INSTALL_SH
# ------------------
# Define $install_sh.