--- branches/magellan-next/include/java.sminc	2012/01/04 14:00:11	9672
+++ branches/magellan-next/include/java.sminc	2012/01/04 14:04:24	9673
@@ -51,13 +51,15 @@
 {
 	local files
 	local jar
+	local jar-base
 
 	files="$@"
 
 	minstalldir ${JAVA_CLASSPATH_DIR} || die
 	for jar in ${files}
 	do
-		minstallfile ${jar} ${JAVA_CLASSPATH_DIR}/${jar//.jar}-${PVER}.jar || die
-		mlink ${jar//.jar}-${PVER}.jar ${JAVA_CLASSPATH_DIR}/${jar} || die
+		jar-base="$(basename ${jar} .jar)"
+		minstallfile ${jar} ${JAVA_CLASSPATH_DIR}/${jar-base}-${PVER}.jar || die
+		mlink ${jar-base}-${PVER}.jar ${JAVA_CLASSPATH_DIR}/${jar-base}.jar || die
 	done
 }