summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Hill <gjthill@gmail.com>2012-04-30 09:03:37 +0200
committerPaolo Bonzini <bonzini@gnu.org>2012-04-30 09:04:38 +0200
commit3b8b5eb3cdec7e39950f87b4aedc79efcd6bf249 (patch)
treeabd0283d19171061a74e77b747bed529c8d18a3b
parent8c7d0777642bc35fbda049250ca84e23112dde6b (diff)
downloadsed-3b8b5eb3cdec7e39950f87b4aedc79efcd6bf249.tar.gz
Remove bootstrap.sh from Makefile.am
* Makefile.am (noinst_DATA, dist-hook): build failed after git clean -dfx finish bootstrap.sh removal.
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.am7
2 files changed, 6 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 3117430..4b282f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-29 Jim Hill <gjthill@gmail.com>
+
+ * Makefile.am (noinst_DATA, dist-hook): build failed after git
+ clean -dfx finish bootstrap.sh removal.
+
2012-04-13 Paolo Bonzini <bonzini@gnu.org>
* sed/compile.c (convert_number): Remove default_char argument,
diff --git a/Makefile.am b/Makefile.am
index b500165..982a314 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@ PACKAGE = sed
SUBDIRS = lib pcre po sed doc testsuite
-noinst_DATA = bootstrap.sh
+noinst_DATA =
noinst_HEADERS = basicdefs.h
EXTRA_DIST = BUGS THANKS COPYING.DOC README.boot \
@@ -20,11 +20,6 @@ html:
DISTCHECK_CONFIGURE_FLAGS = XGETTEXT='$(SHELL) -c : dummy' $(EXTRA_DC_FLAGS)
EXTRA_DC_FLAGS =
-dist-hook:
- cmp bootstrap.sh $(srcdir)/bootstrap.sh > /dev/null 2>&1 || \
- cp -p bootstrap.sh $(srcdir)/bootstrap.sh
- cp -p $(srcdir)/bootstrap.sh $(distdir)/bootstrap.sh
-
full-distcheck:
make distcheck EXTRA_DC_FLAGS='--enable-html'
make distcheck EXTRA_DC_FLAGS='--disable-i18n'