From e54a2682fcea88920bc36f7d3131d5fa653eb867 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Thu, 5 Oct 2006 15:51:45 +0000 Subject: [PATCH] Propagate srcdir into the test correctly. (#359845) 2006-10-05 Behdad Esfahbod * gtk/Makefile.am, gtk/aliasfilescheck.sh: Propagate srcdir into the test correctly. (#359845) --- ChangeLog | 5 +++++ gtk/Makefile.am | 2 +- gtk/aliasfilescheck.sh | 5 ++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9f958bb1f6..2ab004a92f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-10-05 Behdad Esfahbod + + * gtk/Makefile.am, gtk/aliasfilescheck.sh: Propagate srcdir into the + test correctly. (#359845) + 2006-10-05 Michael Natterer * gtk/gtkrc.[ch]: added new scanner token "unbind" which gets diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 0eb166bf2a..9c02d70fd1 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -93,7 +93,7 @@ check-aliases: .PHONY: check-aliases -TESTS_ENVIRONMENT = gtk_all_c_sources="$(gtk_all_c_sources)" +TESTS_ENVIRONMENT = srcdir="$(srcdir)" gtk_all_c_sources="$(gtk_all_c_sources)" TESTS = aliasfilescheck.sh if OS_LINUX TESTS += abicheck.sh pltcheck.sh diff --git a/gtk/aliasfilescheck.sh b/gtk/aliasfilescheck.sh index f350663fb7..31b49d4510 100755 --- a/gtk/aliasfilescheck.sh +++ b/gtk/aliasfilescheck.sh @@ -5,8 +5,7 @@ if test "x$gtk_all_c_sources" = x; then exit 1 fi -grep 'IN_FILE' gtk.symbols | sed 's/.*(//;s/).*//' | grep __ | sort -u > expected-files -grep '^ *# *define __' $gtk_all_c_sources | sed 's/.*define //;s/ *$//' | sort > actual-files +grep 'IN_FILE' ${srcdir-.}/gtk.symbols | sed 's/.*(//;s/).*//' | grep __ | sort -u > expected-files +{ cd ${srcdir-.}; grep '^ *# *define __' $gtk_all_c_sources; } | sed 's/.*define //;s/ *$//' | sort > actual-files diff expected-files actual-files && rm -f expected-files actual-files -