Minor fixups to last commit

diff --git a/src/expr/expr_template.cpp b/src/expr/expr_template.cpp
index 32a1d73e12555de82cda6c1b06b42168e747b2d6..54dc64aa45bd03d5b982325fc4e0eb608a74d2e8 100644 (file)
--- 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 9dbe458dfdc70263618b4d261a67163c0c556429..bcaef2b87e84ec3c63d7a4c33723908b6ff46ddf 100644 (file)
--- 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