diff --git a/rosapps/cmdutils/makefile b/rosapps/cmdutils/makefile index 4d1b7c4f8b2..5e7f92a081a 100644 --- a/rosapps/cmdutils/makefile +++ b/rosapps/cmdutils/makefile @@ -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 + diff --git a/rosapps/dflat32/makefile b/rosapps/dflat32/makefile index 867412aef5f..a9f680c98b7 100644 --- a/rosapps/dflat32/makefile +++ b/rosapps/dflat32/makefile @@ -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 diff --git a/rosapps/sysutils/regexpl/ph.h b/rosapps/sysutils/regexpl/ph.h index e044ffb226e..7f28b5f25f3 100644 --- a/rosapps/sysutils/regexpl/ph.h +++ b/rosapps/sysutils/regexpl/ph.h @@ -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 +#include #include #include diff --git a/rosapps/sysutils/regexpl/regexpl.rc b/rosapps/sysutils/regexpl/regexpl.rc index ad6247b7ba9..8a711411c1c 100644 --- a/rosapps/sysutils/regexpl/regexpl.rc +++ b/rosapps/sysutils/regexpl/regexpl.rc @@ -36,4 +36,5 @@ BEGIN END END -GPL LICENSE "..\\..\\copying" +GPL LICENSE "../../copying" +