summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author <shinichiro.hamaji@gmail.com>2010-05-14 21:45:05 +0000
committer <shinichiro.hamaji@gmail.com>2010-05-14 21:45:05 +0000
commit98b018f44b34260ca53f40905ae3ef207fd3c7d1 (patch)
tree7c506ef0599cdc0e4da9a05d4f0338ee40e2b9e8
parentcb350102153cf25db31903b103ee6bf003cfa7c2 (diff)
downloadglog-98b018f44b34260ca53f40905ae3ef207fd3c7d1.tar.gz
glog-98b018f44b34260ca53f40905ae3ef207fd3c7d1.tar.bz2
glog-98b018f44b34260ca53f40905ae3ef207fd3c7d1.zip
test binaries are in the builddir, not the top_srcdir
http://codereview.appspot.com/989043/show git-svn-id: https://google-glog.googlecode.com/svn/trunk@77 eb4d4688-79bd-11dd-afb4-1d65580434c0
-rw-r--r--Makefile.am4
-rw-r--r--Makefile.in4
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index fbf6b93..772228f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -81,13 +81,13 @@ logging_striplog_test_sh: logging_striptest0 logging_striptest2 logging_striptes
check_SCRIPTS += demangle_unittest_sh
noinst_SCRIPTS += src/demangle_unittest.sh
demangle_unittest_sh: demangle_unittest
- $(top_srcdir)/demangle_unittest # force to create lt-demangle_unittest
+ $(builddir)/demangle_unittest # force to create lt-demangle_unittest
$(top_srcdir)/src/demangle_unittest.sh
check_SCRIPTS += signalhandler_unittest_sh
noinst_SCRIPTS += src/signalhandler_unittest.sh
signalhandler_unittest_sh: signalhandler_unittest
- $(top_srcdir)/signalhandler_unittest # force to create lt-signalhandler_unittest
+ $(builddir)/signalhandler_unittest # force to create lt-signalhandler_unittest
$(top_srcdir)/src/signalhandler_unittest.sh
TEST_BINARIES += logging_striptest0
diff --git a/Makefile.in b/Makefile.in
index 6457dc1..9a73fca 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1426,10 +1426,10 @@ uninstall-am: uninstall-dist_docDATA uninstall-glogincludeHEADERS \
logging_striplog_test_sh: logging_striptest0 logging_striptest2 logging_striptest10
$(top_srcdir)/src/logging_striplog_test.sh
demangle_unittest_sh: demangle_unittest
- $(top_srcdir)/demangle_unittest # force to create lt-demangle_unittest
+ $(builddir)/demangle_unittest # force to create lt-demangle_unittest
$(top_srcdir)/src/demangle_unittest.sh
signalhandler_unittest_sh: signalhandler_unittest
- $(top_srcdir)/signalhandler_unittest # force to create lt-signalhandler_unittest
+ $(builddir)/signalhandler_unittest # force to create lt-signalhandler_unittest
$(top_srcdir)/src/signalhandler_unittest.sh
rpm: dist-gzip packages/rpm.sh packages/rpm/rpm.spec