[glib] Fix distcheck
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] Fix distcheck
- Date: Fri, 13 Apr 2012 23:53:19 +0000 (UTC)
commit c1a83a4ac8b0e45bd176ff1334f58ae2d5c33ad2
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Apr 13 18:51:23 2012 -0400
Fix distcheck
I forgot to dist a test script, and forgot to look for it
in srcdir instead of builddir.
glib/tests/Makefile.am | 3 ++-
glib/tests/spawn-singlethread.c | 5 ++++-
2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/glib/tests/Makefile.am b/glib/tests/Makefile.am
index 3cfca22..26ae31c 100644
--- a/glib/tests/Makefile.am
+++ b/glib/tests/Makefile.am
@@ -300,7 +300,8 @@ EXTRA_DIST += \
keyfiletest.ini \
pages.ini \
bookmarks.xbel \
- empty
+ empty \
+ echo-script
dist-hook:
mkdir $(distdir)/markups; \
diff --git a/glib/tests/spawn-singlethread.c b/glib/tests/spawn-singlethread.c
index e63e789..9f71d59 100644
--- a/glib/tests/spawn-singlethread.c
+++ b/glib/tests/spawn-singlethread.c
@@ -194,12 +194,15 @@ main (int argc,
dirname = g_path_get_dirname (argv[0]);
echo_prog_path = g_build_filename (dirname, "test-spawn-echo", NULL);
- echo_script_path = g_build_filename (dirname, "echo-script", NULL);
if (!g_file_test (echo_prog_path, G_FILE_TEST_EXISTS))
{
g_free (echo_prog_path);
echo_prog_path = g_build_filename (dirname, "lt-test-spawn-echo", NULL);
}
+#ifndef SRCDIR
+#define SRCDIR dirname
+#endif
+ echo_script_path = g_build_filename (SRCDIR, "echo-script", NULL);
if (!g_file_test (echo_script_path, G_FILE_TEST_EXISTS))
{
gchar *tmp;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]