From c19a568e646e977e5134598b1619a6b340561a21 Mon Sep 17 00:00:00 2001
From: Morgan Deters <mdeters@gmail.com>
Date: Tue, 23 Oct 2012 20:04:18 +0000
Subject: some fixes for "make examples" and "make install-examples" when
 invoked from tarballs (non-subversion-checkouts); should fix "INSTALL"
 failure we saw in last night's build email

---
 Makefile    | 10 +---------
 Makefile.am |  4 ++++
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 849d6eeab..4ddb97a85 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@
 builddir = builds
 
 .PHONY: all install
-all install .DEFAULT:
+all install examples install-examples .DEFAULT:
 	@if test -d $(builddir); then \
 		echo cd $(builddir); \
 		cd $(builddir); \
@@ -38,14 +38,6 @@ test: check
 doc: doc-builds
 doc-internals: doc-internals-builds
 
-.PHONY: examples
-examples: all
-	(cd examples && $(MAKE) $(AM_MAKEFLAGS))
-
-.PHONY: install-examples
-install-examples:
-	(cd examples && $(MAKE) $(AM_MAKEFLAGS) install-data)
-
 YEAR := $(shell date +%Y)
 submission submission-main:
 	@if [ -n "`ls src/parser/*/generated 2>/dev/null`" ]; then \
diff --git a/Makefile.am b/Makefile.am
index 9f65e0a64..40994452a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,6 +12,10 @@ DIST_SUBDIRS = $(SUBDIRS) examples
 examples: all
 	(cd examples && $(MAKE) $(AM_MAKEFLAGS))
 
+.PHONY: install-examples
+install-examples:
+	(cd examples && $(MAKE) $(AM_MAKEFLAGS) install-data)
+
 .PHONY: units systemtests regress regress0 regress1 regress2 regress3
 systemtests regress regress0 regress1 regress2 regress3: all
 	+(cd test && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1
-- 
cgit v1.2.3