some fixes for "make examples" and "make install-examples" when invoked from tarballs...

diff --git a/Makefile b/Makefile
index 849d6eeaba22648efde67d63616fd4e4a2daccc8..4ddb97a85081d331bc4bffd0086a8e9c3bedf538 100644 (file)
--- 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 9f65e0a649f3603e76d0cabbef078c8810a7685f..40994452adda0f23e550dc1027139e653d4f39e5 100644 (file)
--- 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