diff --git a/mozilla/java/plugins/config/rules.mk b/mozilla/java/plugins/config/rules.mk
index c118f7db97e..4bb33263fc3 100644
--- a/mozilla/java/plugins/config/rules.mk
+++ b/mozilla/java/plugins/config/rules.mk
@@ -25,9 +25,11 @@ include $(DEPTH)/config/autoconf.mk
include $(DEPTH)/config/config.mk
ifneq ($(PACKAGE_BUILD),)
- PLUGLETS_DIR=$(DIST)/javadev/example
- MISC_DIR=$(DIST)/javadev/misc
- HTML_DIR=$(DIST)/javadev/html
+ JAVADEV=$(DIST)/javadev
+ PLUGLETS_DIR=$(JAVADEV)/example
+ MISC_DIR=$(JAVADEV)/misc
+ HTML_DIR=$(JAVADEV)/misc
+ INSTALL = $(DEPTH)/config/nsinstall -m 666
else
PLUGLETS_DIR=$(DIST)/bin/plugins
MISC_DIR=$(DIST)/bin/res/javadev/pluglets
@@ -41,27 +43,33 @@ $(PLUGLET).jar: $(CLASSES) manifest
.java.class:
$(JDKHOME)/bin/javac -classpath .:../../classes:$(CLASSPATH):JavaDOM.jar $<
clobber:
- rm *.class *.jar
+ rm -f *.class *.jar
+
clean : clobber
+ifneq ($(PLUGLET),)
+ INSTALL_DEPS += install_pluglet
+endif
ifneq ($(HTML),)
- EXPORT_DEPS += export_html
+ INSTALL_DEPS += install_html
endif
ifneq ($(MISC),)
- EXPORT_DEPS += export_misc
+ INSTALL_DEPS += install_misc
endif
-export: $(PLUGLET).jar $(EXPORT_DEPS)
+
+install_pluglet: $(PLUGLET).jar
$(INSTALL) $(PLUGLET).jar $(PLUGLETS_DIR)
-export_html :
+install_html :
$(INSTALL) $(HTML) $(HTML_DIR)
-export_misc :
+install_misc :
$(INSTALL) $(MISC) $(MISC_DIR)
-install: export
+install: $(INSTALL_DEPS)
+export: install
diff --git a/mozilla/java/plugins/examples/Makefile.in b/mozilla/java/plugins/examples/Makefile.in
index db5801b8945..4c009939fc2 100644
--- a/mozilla/java/plugins/examples/Makefile.in
+++ b/mozilla/java/plugins/examples/Makefile.in
@@ -29,6 +29,7 @@ DIRS= \
zip \
rtf \
dom \
+ demo \
$(NULL)
include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/java/plugins/examples/demo/Makefile.in b/mozilla/java/plugins/examples/demo/Makefile.in
new file mode 100644
index 00000000000..963923583ad
--- /dev/null
+++ b/mozilla/java/plugins/examples/demo/Makefile.in
@@ -0,0 +1,28 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Sun Microsystems,
+# Inc. Portions created by Sun are
+# Copyright (C) 1999 Sun Microsystems, Inc. All
+# Rights Reserved.
+#
+# Contributor(s):
+
+DEPTH= ../../../..
+
+HTML=index.html
+
+include ../../config/rules.mk
+
+export:
+ cp pluglet_run.sh $(DEPTH)/bin
diff --git a/mozilla/java/plugins/examples/demo/index.html b/mozilla/java/plugins/examples/demo/index.html
new file mode 100644
index 00000000000..c5ac7ed1a06
--- /dev/null
+++ b/mozilla/java/plugins/examples/demo/index.html
@@ -0,0 +1,12 @@
+
+
+Pluglets demo
+
+
+
+
+
\ No newline at end of file
diff --git a/mozilla/java/plugins/examples/demo/pluglet_run.sh b/mozilla/java/plugins/examples/demo/pluglet_run.sh
new file mode 100755
index 00000000000..4413220aecb
--- /dev/null
+++ b/mozilla/java/plugins/examples/demo/pluglet_run.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+LD_PRELOAD=libXm.so
+export LD_PRELOAD
+./mozilla resource:///res/javadev/pluglets/index.html
\ No newline at end of file