Mercurial > hg > release > icedtea6-1.9

changeset 2263:2fa3935ab384 icedtea6-1.9.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Ensure man page directory exists before copying javaws man page. 2010-10-12 Andrew John Hughes <ahughes@redhat.com> * Makefile.am: (add-netx): Ensure directory exists before copying javaws man page. (add-netx-debug): Likewise.
author Andrew John Hughes <ahughes@redhat.com>
date Tue, 12 Oct 2010 14:07:07 +0100
parents e71a0bed639b
children dd9c36d63a95
files ChangeLog Makefile.am
diffstat 2 files changed, 23 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Oct 11 22:31:47 2010 +0100
+++ b/ChangeLog	Tue Oct 12 14:07:07 2010 +0100
@@ -1,3 +1,10 @@
+2010-10-12  Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am:
+	(add-netx): Ensure directory exists before
+	copying javaws man page.
+	(add-netx-debug): Likewise.
+
 2010-10-11  Andrew John Hughes  <ahughes@redhat.com>
 
 	* NEWS: Add CVE numbers and list 6925672
--- a/Makefile.am	Mon Oct 11 22:31:47 2010 +0100
+++ b/Makefile.am	Tue Oct 12 14:07:07 2010 +0100
@@ -1458,10 +1458,14 @@
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
 	cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \
 	  $(BUILD_OUTPUT_DIR)/j2re-image/lib
-	cp $(NETX_SRCDIR)/javaws.1 \
-	  $(BUILD_OUTPUT_DIR)/j2sdk-image/man/man1
-	cp $(NETX_SRCDIR)/javaws.1 \
-	  $(BUILD_OUTPUT_DIR)/j2re-image/man/man1
+	if [ -d $(BUILD_OUTPUT_DIR)/j2sdk-image/man/man1 ] ; then \
+	  cp $(NETX_SRCDIR)/javaws.1 \
+	    $(BUILD_OUTPUT_DIR)/j2sdk-image/man/man1 ; \
+	fi
+	if [ -d $(BUILD_OUTPUT_DIR)/j2re-image/man/man1 ] ; then \
+	  cp $(NETX_SRCDIR)/javaws.1 \
+	    $(BUILD_OUTPUT_DIR)/j2re-image/man/man1 ; \
+	fi
 	touch stamps/add-netx.stamp
 
 clean-add-netx:
@@ -1484,10 +1488,14 @@
 	  $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
 	cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \
 	  $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib
-	cp $(NETX_SRCDIR)/javaws.1 \
-	  $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/man/man1
-	cp $(NETX_SRCDIR)/javaws.1 \
-	  $(BUILD_OUTPUT_DIR)/j2re-image/man/man1
+	if [ -d $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/man/man1 ] ; then \
+	  cp $(NETX_SRCDIR)/javaws.1 \
+	    $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/man/man1 ; \
+	fi
+	if [ -d $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/man/man1 ] ; then \
+	  cp $(NETX_SRCDIR)/javaws.1 \
+	    $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/man/man1 ; \
+	fi
 	touch stamps/add-netx-debug.stamp
 
 clean-add-netx-debug: