/hg/icedtea6: only generate javaws.1 if we want to build docs an...

[omajid at icedtea.classpath.org]

changeset 2713dbdb914e in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2713dbdb914e
author: omajid
date: Fri Sep 17 10:07:45 2010 -0400

	only generate javaws.1 if we want to build docs and the man
	directory exists

	2010-09-17 Omair Majid <omajid at redhat.com>

	 * Makefile.am: Only create man pages for javaws if ENABLE_DOCS
	is set and the man directory exists.


diffstat:

2 files changed, 41 insertions(+), 12 deletions(-)
ChangeLog   |    5 +++++
Makefile.am |   48 ++++++++++++++++++++++++++++++++++++------------

diffs (91 lines):

diff -r 06703b4d41b4 -r 2713dbdb914e ChangeLog
--- a/ChangeLog	Fri Sep 17 15:01:17 2010 +0100
+++ b/ChangeLog	Fri Sep 17 10:07:45 2010 -0400
@@ -1,3 +1,8 @@ 2010-09-17  Andrew John Hughes  <ahughes
+2010-09-17  Omair Majid  <omajid at redhat.com>
+
+	* Makefile.am: Only create man pages for javaws if ENABLE_DOCS is set
+	and the man directory exists.
+
 2010-09-17  Andrew John Hughes  <ahughes at redhat.com>
 
 	* patches/openjdk/6638712-wildcard_types.patch:
diff -r 06703b4d41b4 -r 2713dbdb914e Makefile.am
--- a/Makefile.am	Fri Sep 17 15:01:17 2010 +0100
+++ b/Makefile.am	Fri Sep 17 10:07:45 2010 -0400
@@ -1424,10 +1424,16 @@ 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
-	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 ENABLE_DOCS
+	if test -d $(BUILD_OUTPUT_DIR)/j2sdk-image/man/man1; then \
+	  cp $(NETX_SRCDIR)/javaws.1 \
+	    $(BUILD_OUTPUT_DIR)/j2sdk-image/man/man1; \
+	fi
+	if test -d $(BUILD_OUTPUT_DIR)/j2re-image/man/man1; then \
+	  cp $(NETX_SRCDIR)/javaws.1 \
+	    $(BUILD_OUTPUT_DIR)/j2re-image/man/man1; \
+	fi
+endif
 	touch stamps/add-netx.stamp
 
 clean-add-netx:
@@ -1437,8 +1443,14 @@ clean-add-netx:
 	rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jar
 	rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/about.jnlp
 	rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/about.jar
-	rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/man/man1/javaws.1
-	rm -f $(BUILD_OUTPUT_DIR)/j2re-image/man/man1/javaws.1
+if ENABLE_DOCS
+	if test -d $(BUILD_OUTPUT_DIR)/j2sdk-image/man/man1; then \
+	  rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/man/man1/javaws.1; \
+	fi
+	if test -d $(BUILD_OUTPUT_DIR)/j2re-image/man/man1; then \
+	  rm -f $(BUILD_OUTPUT_DIR)/j2re-image/man/man1/javaws.1; \
+	fi
+endif
 	rm -f stamps/add-netx.stamp
 
 stamps/add-netx-debug.stamp: stamps/netx-dist.stamp extra-lib/about.jar
@@ -1450,10 +1462,16 @@ stamps/add-netx-debug.stamp: stamps/netx
 	  $(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 ENABLE_DOCS
+	if test -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 test -d $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/man/man1; then \
+	  cp $(NETX_SRCDIR)/javaws.1 \
+	    $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/man/man1; \
+	fi
+endif
 	touch stamps/add-netx-debug.stamp
 
 clean-add-netx-debug:
@@ -1463,8 +1481,14 @@ clean-add-netx-debug:
 	rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jar
 	rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/about.jnlp
 	rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/about.jar
-	rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/man/man1/javaws.1
-	rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/man/man1/javaws.1
+if ENABLE_DOCS
+	if test -d $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/man/man1; then \
+	  rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/man/man1/javaws.1; \
+	fi
+	if test -d $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/man/man1; then \
+	  rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/man/man1/javaws.1; \
+	fi
+endif
 	rm -f stamps/add-netx-debug.stamp
 
 # OpenJDK ecj Targets