Switch automake handling to use --gnu mode, not --foreign.
Remove INSTALL file; automake generates a copy of the latest version.
---
Makefile.am | 5 +++--
bootstrap | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
Switch automake handling to use --gnu mode, not --foreign.
Remove INSTALL file; automake generates a copy of the latest version.
---
Makefile.am | 5 +++--
bootstrap | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
======
only in patch2:
unchanged:
--- Makefile.am (revision 2419)
+++ Makefile.am (working copy)
@@ -1,6 +1,6 @@
# not a GNU package. You can remove this line, if
# have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = foreign 1.6
+AUTOMAKE_OPTIONS = gnu 1.6
nobase_dist_pkgdata_DATA = \
contrib/libdcc/dcc_stdio.c \
@@ -34,7 +34,7 @@
TCL_PATH = tcl
# command to find paths of script files, relative to TCL_PATH
-TCL_FILES := find $(srcdir)/$(TCL_PATH) -name '*.cfg' -o -name '*.tcl' | \
+TCL_FILES = find $(srcdir)/$(TCL_PATH) -name '*.cfg' -o -name '*.tcl' | \
sed -e 's,^$(srcdir)/$(TCL_PATH),,'
dist-hook:
@@ -61,6 +61,7 @@
DISTCLEANFILES = doxygen.log
MAINTAINERCLEANFILES = \
+ $(srcdir)/INSTALL \
$(srcdir)/configure \
$(srcdir)/Makefile.in \
$(srcdir)/depcomp \
only in patch2:
unchanged:
--- bootstrap (revision 2419)
+++ bootstrap (working copy)
@@ -17,7 +17,7 @@
${libtoolize} --automake --copy
autoconf
autoheader
-automake --foreign --add-missing --copy
+automake --gnu --add-missing --copy
)
# AM_MAINTAINER_MODE requires SVN users provide --enable-maintainer-mode
_______________________________________________
Openocd-development mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/openocd-development
