Mercurial > hg > icedtea6

changeset 2258:2713dbdb914e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
only generate javaws.1 if we want to build docs and the man directory exists 2010-09-17 Omair Majid <omajid@redhat.com> * Makefile.am: Only create man pages for javaws if ENABLE_DOCS is set and the man directory exists.
author omajid
date Fri, 17 Sep 2010 10:07:45 -0400
parents 06703b4d41b4
children ddbf2447886c
files ChangeLog Makefile.am
diffstat 2 files changed, 41 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- 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  Omair Majid  <omajid@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@redhat.com>
 
 	* patches/openjdk/6638712-wildcard_types.patch:
--- 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 @@
 	  $(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 @@
 	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 @@
 	  $(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 @@
 	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