summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMorgan Deters <mdeters@cs.nyu.edu>2013-11-07 18:03:42 -0500
committerMorgan Deters <mdeters@cs.nyu.edu>2013-11-07 18:12:13 -0500
commita32a3e05bd8e012d7ac75427becdae9aff8cbc12 (patch)
treef8ac1217f1707d2367871d65b421040eb95d0364 /src
parentad4298296a1d0a93e63fbfdbdc1cc7d0032fafd8 (diff)
Minor fixups to last commit
Diffstat (limited to 'src')
-rw-r--r--src/expr/expr_template.cpp2
-rw-r--r--src/theory/Makefile.subdirs6
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
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback