CVS java-package/blackdown-j2re1.4

Barry Hawkins barryh-guest@haydn.debian.org
Wed Apr 6 04:15:04 2005


Update of /cvsroot/pkg-java/java-package/blackdown-j2re1.4
In directory haydn:/tmp/cvs-serv12113/blackdown-j2re1.4

Modified Files:
	install remove 
Log Message:
Added dynamic architecture pathing for plugin.


--- /cvsroot/pkg-java/java-package/blackdown-j2re1.4/install	2005/02/08 14:27:58	1.3
+++ /cvsroot/pkg-java/java-package/blackdown-j2re1.4/install	2005/04/06 04:14:57	1.4
@@ -23,7 +23,12 @@
 program_alternative rmid
 program_alternative rmiregistry
 
-plugin_dir="$j2se_base/plugin/i386"
+# derive the architecture-specific 
+# directory for the plugin
+arch_dir="$(dpkg --print-architecture)"
+
+# assemble the plugin path
+plugin_dir="$j2se_base/plugin/$arch_dir"
 
 # In 1.4.2, plugins got 'lib' prepended
 if dpkg --compare-versions "$j2se_version" ge "1.4.2"; then
--- /cvsroot/pkg-java/java-package/blackdown-j2re1.4/remove	2005/01/24 23:07:38	1.2
+++ /cvsroot/pkg-java/java-package/blackdown-j2re1.4/remove	2005/04/06 04:14:57	1.3
@@ -17,7 +17,12 @@
 program_alternative rmid
 program_alternative rmiregistry
 
-plugin_dir="$j2se_base/plugin/i386"
+# derive the architecture-specific 
+# directory for the plugin
+arch_dir="$(dpkg --print-architecture)"
+
+# assemble the plugin path
+plugin_dir="$j2se_base/plugin/$arch_dir"
 
 # In 1.4.2, plugins got 'lib' prepended
 if dpkg --compare-versions "$j2se_version" ge "1.4.2"; then