From f17812383d5ca97bd6ee9c624c5515449dcdca42 Mon Sep 17 00:00:00 2001
From: Steven Edwards <winehacker@gmail.com>
Date: Mon, 9 Sep 2002 22:36:40 +0000
Subject: [PATCH] added patch submitted by Guido de Jong

svn path=/trunk/; revision=3482
---
 rosapps/cmd/cmd.rc                |  2 +-
 rosapps/cmd/makefile              | 11 ++++++-----
 rosapps/sysutils/regexpl/Makefile |  4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/rosapps/cmd/cmd.rc b/rosapps/cmd/cmd.rc
index d56e26c7e48..d35e4ed7716 100644
--- a/rosapps/cmd/cmd.rc
+++ b/rosapps/cmd/cmd.rc
@@ -1,5 +1,5 @@
 #include <windows.h>
-#include "../../reactos/include/reactos/resource.h"
+#include <reactos/resource.h>
 #include "cmdver.h"
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
diff --git a/rosapps/cmd/makefile b/rosapps/cmd/makefile
index 2f6d45b5d5e..e7f58d52e54 100644
--- a/rosapps/cmd/makefile
+++ b/rosapps/cmd/makefile
@@ -2,6 +2,7 @@
 #  ReactOS makefile for CMD
 #
 
+PATH_TO_TOP=..
 TARGET=cmd.exe
 
 all: $(TARGET)
@@ -40,15 +41,15 @@ else
 endif
 
 
-dist: $(TARGET:%=../$(DIST_DIR)/apps/%)
+dist: $(TARGET:%=$(PATH_TO_TOP)/$(DIST_DIR)/apps/%)
 
-$(TARGET:%=../$(DIST_DIR)/apps/%): ../$(DIST_DIR)/apps/%: %
+$(TARGET:%=$(PATH_TO_TOP)/$(DIST_DIR)/apps/%): $(PATH_TO_TOP)/$(DIST_DIR)/apps/%: %
 ifeq ($(DOSCLI),yes)
-	$(CP) $* ..\$(DIST_DIR)\apps\$*
+	$(CP) $* $(PATH_TO_TOP)\$(DIST_DIR)\apps\$*
 else
-	$(CP) $* ../$(DIST_DIR)/apps\$*
+	$(CP) $* $(PATH_TO_TOP)/$(DIST_DIR)/apps\$*
 endif
 
-include ../rules.mak
+include $(PATH_TO_TOP)/rules.mak
 
 # EOF
diff --git a/rosapps/sysutils/regexpl/Makefile b/rosapps/sysutils/regexpl/Makefile
index 037957308de..f6b31400492 100644
--- a/rosapps/sysutils/regexpl/Makefile
+++ b/rosapps/sysutils/regexpl/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.7 2002/09/03 18:44:18 chorns Exp $
+# $Id: Makefile,v 1.8 2002/09/09 22:36:40 sedwards Exp $
 #
 #  ReactOS makefile for RegExpl
 #
@@ -9,7 +9,7 @@ include $(PATH_TO_TOP)/rules.mak
 
 TARGET_NAME=regexpl
 
-all: $(TARGET_NAME).exe
+all: $(TARGET_NAME)$(EXE_POSTFIX)
 
 include depend.mak