Make --disable-liveconnect build on icedtea7

[Mark Wielaard]

Hi,

The lib/rt/net directory is only there with --enable-liveconnect (which
is now called --enable-plugin in icedtea6 btw) or --enable-npplugin. So
the following patch makes sure it is only included in those cases,
otherwise the jar command will fail because it cannot find the
directory.

2009-05-23  Mark Wielaard  <mark at klomp.org>

    * Makefile.am (LIVECONNECT_DIR): Add -C lib/rt net.
    (rt-closed.jar): Don't unconditionally add -C lib/rt net.

Committed and pushed,

Mark

diff -r 5744d25c5a37 Makefile.am
--- a/Makefile.am	Sat May 23 00:46:40 2009 +0100
+++ b/Makefile.am	Sat May 23 23:22:12 2009 +0200
@@ -26,13 +26,13 @@
 ICEDTEAPLUGIN_CLEAN = clean-IcedTeaNPPlugin
 ICEDTEAPLUGIN_TARGET = IcedTeaNPPlugin.so
 PLUGIN_PATCH = patches/icedtea-liveconnect.patch
-LIVECONNECT_DIR = -C lib/rt netscape
+LIVECONNECT_DIR = -C lib/rt netscape -C lib/rt net
 else
 if ENABLE_PLUGIN
 ICEDTEAPLUGIN_CLEAN = clean-IcedTeaPlugin
 ICEDTEAPLUGIN_TARGET = IcedTeaPlugin.so
 PLUGIN_PATCH = patches/icedtea-liveconnect.patch
-LIVECONNECT_DIR = -C lib/rt netscape
+LIVECONNECT_DIR = -C lib/rt netscape -C lib/rt net
 else
 ICEDTEAPLUGIN_CLEAN =
 ICEDTEAPLUGIN_TARGET =
@@ -3073,12 +3073,10 @@
 	if ! test -d $(ICEDTEA_BOOT_DIR) ; \
 	then \
 	  $(JAR) cf $@ -C lib/rt com -C lib/rt java \
-	    -C lib/rt javax $(LIVECONNECT_DIR) -C lib/rt sun \
-	    -C lib/rt net ; \
+	    -C lib/rt javax $(LIVECONNECT_DIR) -C lib/rt sun ; \
 	else \
 	  $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt java \
-	    -C lib/rt javax $(LIVECONNECT_DIR) -C lib/rt sun \
-	    -C lib/rt net ; \
+	    -C lib/rt javax $(LIVECONNECT_DIR) -C lib/rt sun ; \
 	fi
 	if test -d bootstrap/ecj/jre/lib ; \
 	then \