Merge pull request zeromq#119 from rimmington/master

make native library search ignore Windows version

pom.xml

@@ -45,8 +45,24 @@
 		<maven-source-plugin.version>2.1.2</maven-source-plugin.version>
 
 		<junit.version>4.8.2</junit.version>
+
+		<native.os>${os.name}</native.os>
 	</properties>
 
+	<profiles>
+		<profile>
+			<id>Windows</id>
+			<activation>
+				<os>
+					<family>windows</family>
+				</os>
+			</activation>
+			<properties>
+				<native.os>Windows</native.os>
+			</properties>
+		</profile>
+	</profiles>
+
 	<dependencies>
 		<dependency>
 			<groupId>junit</groupId>
@@ -63,7 +79,7 @@
 		<resources>
 			<resource>
 				<filtering>false</filtering>
-				<targetPath>NATIVE/${os.arch}/${os.name}</targetPath>
+				<targetPath>NATIVE/${os.arch}/${native.os}</targetPath>
 				<directory>${basedir}/src/.libs</directory>
 				<includes>
 					<include>libjzmq.so</include>

src/org/zeromq/EmbeddedLibraryTools.java

@@ -23,7 +23,12 @@ public class EmbeddedLibraryTools {
 	}
 
 	public static String getCurrentPlatformIdentifier() {
-		return System.getProperty("os.arch") + "/" + System.getProperty("os.name");
+		String osName = System.getProperty("os.name");
+		if (osName.toLowerCase().indexOf("windows") > -1) {
+			osName = "Windows";
+		}
+
+		return System.getProperty("os.arch") + "/" + osName;
 	}
 
 	public static Collection<String> getEmbeddedLibraryList() {