Mercurial > hg > release > icedtea-web-1.2

changeset 330:c959afd1eba7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Path to NEW_LINE_IFS is incorrect.
author Danesh Dadachanji <ddadacha@redhat.com>
date Mon, 13 Feb 2012 11:35:49 -0500
parents 2dd44d3ad58d
children c9a253d0952b
files ChangeLog Makefile.am
diffstat 2 files changed, 11 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Feb 13 11:30:23 2012 -0500
+++ b/ChangeLog	Mon Feb 13 11:35:49 2012 -0500
@@ -1,3 +1,9 @@
+2012-02-10  Danesh Dadachanji  <ddadacha@redhat.com>
+
+	Fix path to NEW_LINE_IFS for when one builds outside of src directory.
+	* Makefile.am: Use top src directory instead of top build directory
+	for NEW_LINE_IFS
+
 2012-02-06  Danesh Dadachanji  <ddadacha@redhat.com>
 
 	Fixed regression in running webstart applets from JNLP files.
--- a/Makefile.am	Mon Feb 13 11:30:23 2012 -0500
+++ b/Makefile.am	Mon Feb 13 11:35:49 2012 -0500
@@ -475,7 +475,7 @@
 stamps/netx-dist-tests-prepare-reproducers.stamp: stamps/junit-jnlp-dist-dirs
 	types=(simple signed); \
 	for which in "$${types[@]}" ; do \
-	  . $(abs_top_builddir)/NEW_LINE_IFS ; \
+	  . $(abs_top_srcdir)/NEW_LINE_IFS ; \
 	  simpleReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-$$which.txt `); \
 	  IFS="$$IFS_BACKUP" ; \
 	  for dir in "$${simpleReproducers[@]}" ; do \
@@ -503,7 +503,7 @@
 	keystore=$(abs_top_builddir)/$(KEYSTORE_NAME); \
 	pass=123456789; \
 	$(BOOT_DIR)/bin/keytool -genkey -alias $$alias -keystore $$keystore -keypass $$pass -storepass $$pass -dname "cn=$$alias, ou=$$alias, o=$$alias, c=$$alias" ; \
-	  . $(abs_top_builddir)/NEW_LINE_IFS ; \
+	  . $(abs_top_srcdir)/NEW_LINE_IFS ; \
 	signedReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-signed.txt `); \
 	  IFS="$$IFS_BACKUP" ; \
 	for dir in "$${signedReproducers[@]}" ; do \
@@ -528,7 +528,7 @@
  netx-dist-tests-source-files.txt stamps/netx-dist-tests-compile.stamp
 	types=(simple signed); \
 	for which in "$${types[@]}" ; do \
-	  . $(abs_top_builddir)/NEW_LINE_IFS ; \
+	  . $(abs_top_srcdir)/NEW_LINE_IFS ; \
 	  simpleReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-$$which.txt `); \
 	  IFS="$$IFS_BACKUP" ; \
 	  for dir in "$${simpleReproducers[@]}" ; do \
@@ -677,7 +677,7 @@
 	k=0 ; \
 	types=(simple signed); \
 	for which in "$${types[@]}" ; do \
-	  . $(abs_top_builddir)/NEW_LINE_IFS ; \
+	  . $(abs_top_srcdir)/NEW_LINE_IFS ; \
 	  simpleReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-$$which.txt `); \
 	  IFS="$$IFS_BACKUP" ; \
 	  for dir in "$${simpleReproducers[@]}" ; do \
@@ -740,7 +740,7 @@
 	k=0 ; \
 	types=(simple signed); \
 	for which in "$${types[@]}" ; do \
-	  . $(abs_top_builddir)/NEW_LINE_IFS ; \
+	  . $(abs_top_srcdir)/NEW_LINE_IFS ; \
 	  simpleReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-$$which.txt `); \
 	  IFS="$$IFS_BACKUP" ; \
 	  for dir in "$${simpleReproducers[@]}" ; do \