X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=pom.xml;h=a22561801823f0f1930b1057400f71def8cf9e7f;hb=098106513b8d3ae22e83c26ed6213fa3ea4c7371;hp=4271042a47961163b90a119c932ef620eea6b909;hpb=2ba58b28a0a13713dc5d7a92644f0b7394672d46;p=yaz4j-moved-to-github.git

diff --git a/pom.xml b/pom.xml
index 4271042..a225618 100644
--- a/pom.xml
+++ b/pom.xml
@@ -251,7 +251,7 @@
         </os>
       </activation>
       <properties>
-        <platform>linux</platform>
+        <platform>linux</platform> <!-- no solaris etc -->
         <packaging>so</packaging>
         <!-- yaz-config executable -->
         <yaz.config>yaz-config</yaz.config>
@@ -276,9 +276,17 @@
                 <configuration>
                   <tasks>
                     <exec executable="${yaz.config}" 
-                      outputproperty="yaz.include">
+                      outputproperty="yaz-config.include"
+                      errorproperty="yaz-config.error">
                       <arg value="--include" />
                     </exec>
+                    <echo 
+                      message="yaz-config error (if any): ${yaz-config.error}"/>
+                    <condition property="yaz.include" 
+                      value="-I/usr/include"
+                      else="${yaz-config.include}">
+                      <equals arg1="${yaz-config.include}" arg2=""/>
+                    </condition>
                     <echo message="YAZ INCLUDE=${yaz.include}"/>
                     <mkdir dir="${basedir}/target"/>
                     <echo file="${basedir}/target/swig.properties"
@@ -312,7 +320,7 @@
     </profile>
 
     <profile>
-      <!-- osx is both 'unix' and 'mac' -->
+      <!-- osx family is both 'unix' and 'mac' -->
       <id>osx</id>
       <activation>
         <os>
@@ -322,13 +330,31 @@
       <properties>
         <platform>osx</platform>
         <packaging>dylib</packaging>
-        <javahOS>mac</javahOS>
+        <javahOS>darwin</javahOS>
+        <jdkIncludePath>${java.home}/../include</jdkIncludePath>
+      </properties>
+      <modules>
+        <module>unix</module>
+      </modules>
+    </profile>
+
+    <profile>
+      <!-- Apple JDK has a different include layout -->
+      <id>apple-jdk</id>
+      <activation>
+        <property>
+          <name>java.vendor</name>
+          <value>Apple Inc.</value>
+        </property>
+      </activation>
+      <properties>
         <jdkIncludePath>${java.home}/../Headers</jdkIncludePath>
       </properties>
       <modules>
         <module>unix</module>
       </modules>
     </profile>
+
   </profiles>
 </project>