Install orc tests into $prefix/lib/orc/

diff --git a/configure.ac b/configure.ac
index 669ec28..0d79be7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -111,6 +111,9 @@ AC_SUBST(ORC_LIBS)
 pkgconfigdir="\$(libdir)/pkgconfig"
 AC_SUBST(pkgconfigdir)
 
+orcbindir="\$(libdir)/orc/"
+AC_SUBST(orcbindir)
+
 AC_CONFIG_FILES([
 Makefile 
 doc/Makefile

diff --git a/examples/Makefile.am b/examples/Makefile.am
index f9783be..3216bf5 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,5 +1,5 @@
 
-noinst_PROGRAMS = jit simple mt19937ar
+orcbin_PROGRAMS = jit simple mt19937ar
 
 AM_LDFLAGS = $(ORC_LIBS)
 AM_CFLAGS = $(ORC_CFLAGS)

diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 90c3e6b..7b33bfe 100644 (file)
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -1,7 +1,7 @@
 
 TESTS = test1 test2 test3 test4 test5 test_local_opcode_execution
 
-noinst_PROGRAMS = test1 test2 test3 test4 test5 test_local_opcode_execution
+orcbin_PROGRAMS = test1 test2 test3 test4 test5 test_local_opcode_execution
 
 AM_CFLAGS = $(ORC_CFLAGS)
 LIBS = $(ORC_LIBS) $(top_builddir)/orc-test/liborc-test-0.3.la

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 0f3ba2e..f4381f0 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,5 +1,5 @@
 
-bin_PROGRAMS = orcc
+orcbin_PROGRAMS = orcc
 
 AM_CFLAGS = $(ORC_CFLAGS)
 LDADD = $(ORC_LIBS) ../orc-test/liborc-test-0.3.la