[evolution-data-server] Fixed eds-installed-tests.m4 to consider DESTDIR.
- From: Tristan Van Berkom <tvb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Fixed eds-installed-tests.m4 to consider DESTDIR.
- Date: Mon, 2 Dec 2013 13:00:10 +0000 (UTC)
commit c06ac6d2ba2402d5556965e073f444f378bf66c0
Author: Tristan Van Berkom <tristanvb openismus com>
Date: Mon Dec 2 21:59:41 2013 +0900
Fixed eds-installed-tests.m4 to consider DESTDIR.
m4/eds-installed-tests.m4 | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/m4/eds-installed-tests.m4 b/m4/eds-installed-tests.m4
index 353c6c6..5319c5c 100644
--- a/m4/eds-installed-tests.m4
+++ b/m4/eds-installed-tests.m4
@@ -79,7 +79,8 @@ ifeq ($(EDS_INSTALLED_TESTS_ENABLED),yes)
install-exec-am: installed-tests-exec-hook
install-data-am: installed-tests-data-hook
-META_DIRECTORY=${prefix}/share/installed-tests/${PACKAGE}
+META_DIRECTORY=${DESTDIR}/${datadir}/share/installed-tests/${PACKAGE}
+EXEC_DIRECTORY=${DESTDIR}/${pkglibexecdir}/installed-tests
FINAL_TEST_ENVIRONMENT=
ifneq ($(INSTALLED_TESTS_ENVIRONMENT),)
@@ -87,9 +88,9 @@ ifneq ($(INSTALLED_TESTS_ENVIRONMENT),)
endif
installed-tests-exec-hook:
- @$(MKDIR_P) $(pkglibexecdir)/installed-tests;
- @for test in $(INSTALLED_TESTS); do \
- $(LIBTOOL) --mode=install $(INSTALL) --mode=777 $$test $(pkglibexecdir)/installed-tests; \
+ @$(MKDIR_P) $(EXEC_DIRECTORY);
+ @for test in $(INSTALLED_TESTS); do \
+ $(LIBTOOL) --mode=install $(INSTALL) --mode=777 $$test $(EXEC_DIRECTORY); \
done
installed-tests-data-hook:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]