summaryrefslogtreecommitdiff
path: root/Tools/bin/merge
diff options
context:
space:
mode:
authorbbahnsen <bbahnsen@6f19259b-4bc3-4df7-8a09-765794883524>2006-10-20 20:59:43 +0000
committerbbahnsen <bbahnsen@6f19259b-4bc3-4df7-8a09-765794883524>2006-10-20 20:59:43 +0000
commit92a4a910df99b2151e501b76f311575f2e1ebe9a (patch)
tree88d93eaa4e1f36a773c67e467e8152c0d7e5c280 /Tools/bin/merge
parentfb9d7224e61fc70c76cae470f0a2edb3b385f2ca (diff)
downloadedk2-platforms-92a4a910df99b2151e501b76f311575f2e1ebe9a.tar.xz
Fix the CLASSPATH
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1807 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'Tools/bin/merge')
-rwxr-xr-xTools/bin/merge3
1 files changed, 1 insertions, 2 deletions
diff --git a/Tools/bin/merge b/Tools/bin/merge
index 32b1411af0..8bd2efdbda 100755
--- a/Tools/bin/merge
+++ b/Tools/bin/merge
@@ -9,7 +9,6 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
-# export CLASSPATH=$CLASSPATH:$WORKSPACE/Tools/Jars/ContextTool.jar
# Run Framework Wizard
-java -cp ${WORKSPACE}/Tools/bin/Merge.jar org.tianocore.Merge.Merge $@
+java -cp "${WORKSPACE}/Tools/bin/Merge.jar" org.tianocore.Merge.Merge $@