diff options
| author | Morgan Deters <mdeters@gmail.com> | 2012-10-23 20:04:18 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2012-10-23 20:04:18 +0000 |
| commit | c19a568e646e977e5134598b1619a6b340561a21 (patch) | |
| tree | 26aaf021c347553b04251bbacbcf359de258728f | |
| parent | 62ff31bde206239d7abc9bb66c658131d8138f62 (diff) | |
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
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | Makefile.am | 4 |
2 files changed, 5 insertions, 9 deletions
@@ -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 |