Mercurial > hg > icedtea6

changeset 2262:0c7a9312151e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert 2713dbdb914e changes to javaws.1 installation. 2010-09-19 Andrew John Hughes <ahughes@redhat.com> * Makefile.am: Revert 2713dbdb914e changes to javaws.1 installation.
author Andrew John Hughes <ahughes@redhat.com>
date Sun, 19 Sep 2010 23:04:46 +0100
parents ed033548219c
children e470c7b5f2dc
files ChangeLog Makefile.am
diffstat 2 files changed, 18 insertions(+), 36 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Sep 19 23:00:46 2010 +0100
+++ b/ChangeLog	Sun Sep 19 23:04:46 2010 +0100
@@ -1,3 +1,9 @@
+2010-09-19  Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am:
+	Revert 2713dbdb914e changes to javaws.1
+	installation.
+
 2010-09-19  Andrew John Hughes  <ahughes@redhat.com>
 
 	Support HotSpot 19.
--- a/Makefile.am	Sun Sep 19 23:00:46 2010 +0100
+++ b/Makefile.am	Sun Sep 19 23:04:46 2010 +0100
@@ -1429,16 +1429,10 @@
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
 	cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \
 	  $(BUILD_OUTPUT_DIR)/j2re-image/lib
-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
+	cp $(NETX_SRCDIR)/javaws.1 \
+	  $(BUILD_OUTPUT_DIR)/j2sdk-image/man/man1; \
+	cp $(NETX_SRCDIR)/javaws.1 \
+	  $(BUILD_OUTPUT_DIR)/j2re-image/man/man1; \
 	touch stamps/add-netx.stamp
 
 clean-add-netx:
@@ -1448,14 +1442,8 @@
 	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
-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 $(BUILD_OUTPUT_DIR)/j2sdk-image/man/man1/javaws.1
+	rm -f $(BUILD_OUTPUT_DIR)/j2re-image/man/man1/javaws.1
 	rm -f stamps/add-netx.stamp
 
 stamps/add-netx-debug.stamp: stamps/netx-dist.stamp extra-lib/about.jar
@@ -1467,16 +1455,10 @@
 	  $(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
-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
+	cp $(NETX_SRCDIR)/javaws.1 \
+	  $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/man/man1
+	cp $(NETX_SRCDIR)/javaws.1 \
+	  $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/man/man1
 	touch stamps/add-netx-debug.stamp
 
 clean-add-netx-debug:
@@ -1486,14 +1468,8 @@
 	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
-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 $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/man/man1/javaws.1
+	rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/man/man1/javaws.1
 	rm -f stamps/add-netx-debug.stamp
 
 # OpenJDK ecj Targets