projects
/
yaz4j-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
7aab377
)
Unix uses ${yaz.config} path
author
Jakub Skoczen
<jakub@indexdata.dk>
Thu, 7 Jun 2012 08:59:33 +0000
(10:59 +0200)
committer
Jakub Skoczen
<jakub@indexdata.dk>
Thu, 7 Jun 2012 08:59:33 +0000
(10:59 +0200)
linux/pom.xml
patch
|
blob
|
history
pom.xml
patch
|
blob
|
history
diff --git
a/linux/pom.xml
b/linux/pom.xml
index
ec77628
..
2dc0cd5
100644
(file)
--- a/
linux/pom.xml
+++ b/
linux/pom.xml
@@
-26,11
+26,11
@@
</goals>
<configuration>
<tasks>
</goals>
<configuration>
<tasks>
- <exec executable="${yaz.path}yaz-config" outputproperty="yaz.cflags">
+ <exec executable="${yaz.config}" outputproperty="yaz.cflags">
<arg value="--cflags" />
</exec>
<echo message="YAZ CFLAGS: ${yaz.cflags}"/>
<arg value="--cflags" />
</exec>
<echo message="YAZ CFLAGS: ${yaz.cflags}"/>
- <exec executable="${yaz.path}yaz-config" outputproperty="yaz.libs">
+ <exec executable="${yaz.config}" outputproperty="yaz.libs">
<arg value="--libs" />
</exec>
<echo message="YAZ LIBS: ${yaz.libs}"/>
<arg value="--libs" />
</exec>
<echo message="YAZ LIBS: ${yaz.libs}"/>
diff --git
a/pom.xml
b/pom.xml
index
b5439c9
..
57ac9cb
100644
(file)
--- a/
pom.xml
+++ b/
pom.xml
@@
-182,8
+182,9
@@
</activation>
<properties>
<platform>win32</platform>
</activation>
<properties>
<platform>win32</platform>
- <yaz.include>C:\Program Files\YAZ\include</yaz.include>
<yaz.path>C:\Program Files\YAZ\</yaz.path>
<yaz.path>C:\Program Files\YAZ\</yaz.path>
+ <!-- needed by swig -->
+ <yaz.include>-I${yaz.path}\include</yaz.include>
</properties>
<modules>
<module>win32</module>
</properties>
<modules>
<module>win32</module>
@@
-199,8
+200,8
@@
</activation>
<properties>
<platform>linux</platform>
</activation>
<properties>
<platform>linux</platform>
- <!-- must include trailing slash if specified-->
- <yaz.path></yaz.path>
+ <!-- yaz-config executable -->
+ <yaz.config>yaz-config</yaz.config>
<javahOS>linux</javahOS>
<jdkIncludePath>${java.home}/../include</jdkIncludePath>
</properties>
<javahOS>linux</javahOS>
<jdkIncludePath>${java.home}/../include</jdkIncludePath>
</properties>
@@
-220,7
+221,7
@@
</goals>
<configuration>
<tasks>
</goals>
<configuration>
<tasks>
- <exec executable="${yaz.path}yaz-config"
+ <exec executable="${yaz.config}"
outputproperty="yaz.include">
<arg value="--include" />
</exec>
outputproperty="yaz.include">
<arg value="--include" />
</exec>