From a32a3e05bd8e012d7ac75427becdae9aff8cbc12 Mon Sep 17 00:00:00 2001 From: Morgan Deters Date: Thu, 7 Nov 2013 18:03:42 -0500 Subject: [PATCH] Minor fixups to last commit --- src/expr/expr_template.cpp | 2 +- src/theory/Makefile.subdirs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/expr/expr_template.cpp b/src/expr/expr_template.cpp index 32a1d73e1..54dc64aa4 100644 --- a/src/expr/expr_template.cpp +++ b/src/expr/expr_template.cpp @@ -31,7 +31,7 @@ ${includes} // compiler directs the user to the template file instead of the // generated one. We don't want the user to modify the generated one, // since it'll get overwritten on a later build. -#line 34 "${template}" +#line 35 "${template}" using namespace CVC4::kind; using namespace std; diff --git a/src/theory/Makefile.subdirs b/src/theory/Makefile.subdirs index 9dbe458df..bcaef2b87 100644 --- a/src/theory/Makefile.subdirs +++ b/src/theory/Makefile.subdirs @@ -1,7 +1,7 @@ $(top_builddir)/src/theory/.subdirs: $(top_srcdir)/src/Makefile.am - $(AM_V_at)grep '^THEORIES = ' $(top_srcdir)/src/Makefile.am | cut -d' ' -f3- | tr ' ' "\n" | xargs -I__D__ echo $(top_srcdir)/src/theory/__D__/kinds >$(top_builddir)/src/theory/.subdirs.tmp - @if ! diff -q $(top_builddir)/src/theory/.subdirs $(top_builddir)/src/theory/.subdirs.tmp &>/dev/null; then \ + $(AM_V_at)grep '^THEORIES = ' $(abs_top_srcdir)/src/Makefile.am | cut -d' ' -f3- | tr ' ' "\n" | xargs -I__D__ echo $(abs_top_srcdir)/src/theory/__D__/kinds >$(abs_top_builddir)/src/theory/.subdirs.tmp + @if ! diff -q $(abs_top_builddir)/src/theory/.subdirs $(abs_top_builddir)/src/theory/.subdirs.tmp &>/dev/null; then \ echo " GEN " $@; \ - $(am__mv) $(top_builddir)/src/theory/.subdirs.tmp $(top_builddir)/src/theory/.subdirs; \ + $(am__mv) $(abs_top_builddir)/src/theory/.subdirs.tmp $(abs_top_builddir)/src/theory/.subdirs; \ fi -- 2.30.2