diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2011-07-12 22:53:45 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2011-07-12 22:53:45 +0000 |
| commit | 3a1f3ec4f9586d4b666d5d7ac4f0bf0989caef90 (patch) | |
| tree | fc05bef40e729d77ad1e9fa65daf0cd3bf9e3763 /java | |
| parent | f699e826192cf9f1942da516dc59a09bf205030a (diff) | |
Replace "readlink -f" with realpath(1). This should fix "make test" on
7.4 and 8.2 when both "RHINO" and "TEST" options are enabled.
Suggested by: Warren Block (wblock at wonkity dot com)
Notes
Notes:
svn path=/head/; revision=277617
Diffstat (limited to 'java')
| -rw-r--r-- | java/icedtea-web/files/patch-Makefile.in | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/java/icedtea-web/files/patch-Makefile.in b/java/icedtea-web/files/patch-Makefile.in index 7443146db435..86cbc44ddfa8 100644 --- a/java/icedtea-web/files/patch-Makefile.in +++ b/java/icedtea-web/files/patch-Makefile.in @@ -1,5 +1,5 @@ --- Makefile.in.orig 2011-06-08 17:59:15.371244000 -0400 -+++ Makefile.in 2011-07-12 13:22:56.000000000 -0400 ++++ Makefile.in 2011-07-12 18:44:48.000000000 -0400 @@ -275,14 +275,14 @@ @@ -140,15 +140,17 @@ itweb-settings.desktop: $(srcdir)/itweb-settings.desktop.in sed "s#PATH_TO_ITWEB_SETTINGS#$(bindir)/$(itweb_settings)#" \ -@@ -897,7 +901,7 @@ +@@ -897,8 +901,8 @@ fi check-pac-functions: stamps/bootstrap-directory.stamp - ./jrunscript $(abs_top_srcdir)/tests/netx/pac/pac-funcs-test.js \ +- $$(readlink -f $(abs_top_srcdir)/netx/net/sourceforge/jnlp/runtime/pac-funcs.js) + $(SHELL) jrunscript $(abs_top_srcdir)/tests/netx/pac/pac-funcs-test.js \ - $$(readlink -f $(abs_top_srcdir)/netx/net/sourceforge/jnlp/runtime/pac-funcs.js) ++ $$(realpath $(abs_top_srcdir)/netx/net/sourceforge/jnlp/runtime/pac-funcs.js) junit-runner-source-files.txt: + find $(JUNIT_RUNNER_SRCDIR) -name '*.java' | sort > $@ @@ -926,10 +930,11 @@ run-netx-unit-tests: stamps/netx-unit-tests-compile.stamp \ |