/hg/icedtea6: Makefile.am (stamps/add-netx.stamp): Create target...

[Dr Andrew John Hughes]

On 11:35 Tue 12 Oct     , doko at icedtea.classpath.org wrote:
> changeset a18694f7c8fa in /hg/icedtea6
> details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a18694f7c8fa
> author: doko at ubuntu.com
> date: Tue Oct 12 13:32:46 2010 +0200
> 
> 	Makefile.am (stamps/add-netx.stamp): Create target directories.
> 
> 	This fails otherwise, when BUILD_* and ALT_*_DIST environment vars
> 	are used as with --with-additional-vms=zero.
> 
> 	2010-10-12 Matthias Klose <doko at ubuntu.com>
> 
> 	 * Makefile.am (stamps/add-netx.stamp): Create target
> 	directories.
> 
> 
> diffstat:
> 
> 2 files changed, 8 insertions(+), 2 deletions(-)
> ChangeLog   |    4 ++++
> Makefile.am |    6 ++++--
> 
> diffs (29 lines):
> 
> diff -r 4698e476b886 -r a18694f7c8fa ChangeLog
> --- a/ChangeLog	Fri Oct 08 11:06:14 2010 -0400
> +++ b/ChangeLog	Tue Oct 12 13:32:46 2010 +0200
> @@ -1,3 +1,7 @@ 2010-10-08  Omair Majid  <omajid at redhat.
> +2010-10-12  Matthias Klose  <doko at ubuntu.com>
> +
> +	* Makefile.am (stamps/add-netx.stamp): Create target directories.
> +
>  2010-10-08  Omair Majid  <omajid at redhat.com>
>  
>  	* NEWS: Updated
> diff -r 4698e476b886 -r a18694f7c8fa Makefile.am
> --- a/Makefile.am	Fri Oct 08 11:06:14 2010 -0400
> +++ b/Makefile.am	Tue Oct 12 13:32:46 2010 +0200
> @@ -1386,10 +1386,12 @@ stamps/add-netx.stamp: stamps/netx-dist.
>  	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
>  	cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \
>  	  $(BUILD_OUTPUT_DIR)/j2re-image/lib
> +	mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/man/man1
>  	cp $(NETX_SRCDIR)/javaws.1 \
> -	  $(BUILD_OUTPUT_DIR)/j2sdk-image/man/man1; \
> +	  $(BUILD_OUTPUT_DIR)/j2sdk-image/man/man1
> +	mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/man/man1
>  	cp $(NETX_SRCDIR)/javaws.1 \
> -	  $(BUILD_OUTPUT_DIR)/j2re-image/man/man1; \
> +	  $(BUILD_OUTPUT_DIR)/j2re-image/man/man1
>  	touch stamps/add-netx.stamp
>  
>  clean-add-netx:

We already discussed this previously; if these directories are not
present, it indicates that the JDK has not been built.

I think a better solution would be to test if the directory exists,
rather than just creating it, so we don't end up with one man page
being installed on its own.  We also need to cover the add-netx-debug
case.
-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8