Author: kwright
Date: Sun Nov 2 23:24:32 2014
New Revision: 1636208
URL: http://svn.apache.org/r1636208
Log:
Pull up lib-proprietary classpath fix from trunk.
Modified:
manifoldcf/branches/dev_1x/ (props changed)
manifoldcf/branches/dev_1x/framework/ (props changed)
manifoldcf/branches/dev_1x/framework/build.xml
Propchange: manifoldcf/branches/dev_1x/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1636207
Propchange: manifoldcf/branches/dev_1x/framework/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk/framework:r1636207
Modified: manifoldcf/branches/dev_1x/framework/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/build.xml?rev=1636208&r1=1636207&r2=1636208&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/framework/build.xml (original)
+++ manifoldcf/branches/dev_1x/framework/build.xml Sun Nov 2 23:24:32 2014
@@ -1685,10 +1685,10 @@
<target name="process-lib-proprietary-classpath" depends="lib-proprietary">
<property name="process-lib-proprietary-classpath"
location="../lib-proprietary"/>
<pathconvert property="process-lib-proprietary-classpath-win"
refid="process-lib-proprietary" dirsep="\" pathsep=";">
- <map from="${process-lib-proprietary-classpath}" to="..\lib"/>
+ <map from="${process-lib-proprietary-classpath}"
to="..\lib-proprietary"/>
</pathconvert>
<pathconvert property="process-lib-proprietary-classpath-unix"
refid="process-lib-proprietary" dirsep="/" pathsep=":">
- <map from="${process-lib-proprietary-classpath}" to="../lib"/>
+ <map from="${process-lib-proprietary-classpath}"
to="../lib-proprietary"/>
</pathconvert>
</target>
