diff --git a/ChangeLog b/ChangeLog
index 0541e931..7dfa20b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Nov 19 10:58:28 1997  Ovidiu Predescu <ovidiu@net-community.com>
+
+	* debugapp.in: Changed library_combo variable to LIBRARY_COMBO.
+	* tool.make: When installing take the tool from GNUSTEP_OBJ_DIR.
+
 Mon Nov 17 13:05:44 1997  Ovidiu Predescu <ovidiu@net-community.com>
 
 	* application.make: Output the file containing the paths for the
diff --git a/debugapp.in b/debugapp.in
index 282ed198..071a62eb 100644
--- a/debugapp.in
+++ b/debugapp.in
@@ -27,7 +27,7 @@ if [ -z "$1" ]; then
   exit 1
 fi
 
-library_combo=@ac_cv_library_combo@
+LIBRARY_COMBO=@ac_cv_library_combo@
 
 case $1 in
   --library-combo=*)
diff --git a/tool.make b/tool.make
index 17731c97..47fc44ad 100644
--- a/tool.make
+++ b/tool.make
@@ -86,7 +86,7 @@ internal-install-dirs::
 	$(GNUSTEP_MAKEFILES)/mkinstalldirs $(TOOL_INSTALLATION_DIR)
 
 install-tool::
-	$(INSTALL_PROGRAM) -m 0755 $(INTERNAL_tool_NAME) \
+	$(INSTALL_PROGRAM) -m 0755 $(GNUSTEP_OBJ_DIR)/$(INTERNAL_tool_NAME) \
 	    $(TOOL_INSTALLATION_DIR);
 
 internal-tool-uninstall::