diff --git a/makellvm b/makellvm
index b61a99ad362..8924012203b 100755
--- a/makellvm
+++ b/makellvm
@@ -1,9 +1,16 @@
 #!/bin/csh -f
 
-set LLVMDIR = $HOME/llvm
+	## LLVMDIR is simply the directory where this script resides!
+set THISEXEC = $0		## cannot use :h on $0 for some reason
+set LLVMDIR = $THISEXEC:h
 set EXEC = opt
 
 if ($#argv > 0) then
+    if (&& $argv[1] == "-h") then
+	echo 'USAGE: makellvm [toolname]   (toolname defaults to "opt").'
+	exit 0
+    endif
+
     set EXEC = NO_SUCH_TOOL
     set TOOLS = `grep DIRS ${LLVMDIR}/tools/Makefile | sed 's/DIRS[ 	]*=[ 	]*//'`
     foreach T ( $TOOLS )
diff --git a/utils/makellvm b/utils/makellvm
index b61a99ad362..8924012203b 100755
--- a/utils/makellvm
+++ b/utils/makellvm
@@ -1,9 +1,16 @@
 #!/bin/csh -f
 
-set LLVMDIR = $HOME/llvm
+	## LLVMDIR is simply the directory where this script resides!
+set THISEXEC = $0		## cannot use :h on $0 for some reason
+set LLVMDIR = $THISEXEC:h
 set EXEC = opt
 
 if ($#argv > 0) then
+    if (&& $argv[1] == "-h") then
+	echo 'USAGE: makellvm [toolname]   (toolname defaults to "opt").'
+	exit 0
+    endif
+
     set EXEC = NO_SUCH_TOOL
     set TOOLS = `grep DIRS ${LLVMDIR}/tools/Makefile | sed 's/DIRS[ 	]*=[ 	]*//'`
     foreach T ( $TOOLS )