added patch submitted by Guido de Jong
authorSteven Edwards <winehacker@gmail.com>
Mon, 9 Sep 2002 22:49:00 +0000 (22:49 +0000)
committerSteven Edwards <winehacker@gmail.com>
Mon, 9 Sep 2002 22:49:00 +0000 (22:49 +0000)
svn path=/trunk/; revision=3483

rosapps/cmdutils/makefile
rosapps/dflat32/makefile
rosapps/sysutils/regexpl/ph.h
rosapps/sysutils/regexpl/regexpl.rc

index 4d1b7c4..5e7f92a 100644 (file)
@@ -2,6 +2,8 @@
 #  ReactOS cmdutils makefile
 #
 
+PATH_TO_TOP=..
+
 TARGET=more.exe tee.exe y.exe
 
 all: $(TARGET)
@@ -39,13 +41,14 @@ 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
+
index 867412a..a9f680c 100644 (file)
@@ -2,6 +2,8 @@
 #  ReactOS makefile for D-Flat/32
 #
 
+PATH_TO_TOP=..
+
 TARGET=edit.exe
 
 all: $(TARGET)
@@ -40,18 +42,18 @@ else
 endif
 
 
-dist: $(TARGET:%=../$(DIST_DIR)/apps/%)
+dist: $(TARGET:%=$(PATH_TO_TOP)/$(DIST_DIR)/apps/%)
 
-$(TARGET:%=../$(DIST_DIR)/apps/%): ../$(DIST_DIR)/apps/%: %
+$(TARGET:%=../$(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
 
 
 #WITH_DEBUGGING=yes
 
-include ../rules.mak
+include $(PATH_TO_TOP)/rules.mak
 
 # EOF
index e044ffb..7f28b5f 100644 (file)
@@ -1,4 +1,4 @@
-/* $Id: ph.h,v 1.3 2001/01/13 23:54:40 narnaoud Exp $ */
+/* $Id: ph.h,v 1.4 2002/09/09 22:48:03 sedwards Exp $ */
 
 // ph.h : include file for standard system include files,
 //  or project specific include files that are used frequently, but
@@ -18,7 +18,7 @@
 #define _DEBUG
 #endif
 
-#include <TCHAR.H>
+#include <tchar.h>
 
 #include <stdio.h>
 #include <stdlib.h>
index ad6247b..8a71141 100644 (file)
@@ -36,4 +36,5 @@ BEGIN
     END
 END
 
-GPL LICENSE "..\\..\\copying"
+GPL LICENSE "../../copying"
+