minor fix for 'dist'

[reactos.git] / rosapps / cmd / makefile

diff --git a/rosapps/cmd/makefile b/rosapps/cmd/makefile
index 9a906c3..0b541ab 100644 (file)
--- a/rosapps/cmd/makefile
+++ b/rosapps/cmd/makefile
@@ -2,6 +2,7 @@
 #  ReactOS makefile for CMD
 #
 
+PATH_TO_TOP=..
 TARGET=cmd.exe
 
 all: $(TARGET)
@@ -11,14 +12,14 @@ OBJECTS = cmd.o attrib.o alias.o batch.o beep.o call.o chcp.o choice.o \
           delay.o dir.o dirstack.o echo.o error.o filecomp.o for.o free.o \
           goto.o history.o if.o internal.o label.o locale.o memory.o misc.o \
           move.o msgbox.o path.o pause.o prompt.o redir.o ren.o screen.o \
-          set.o shift.o start.o time.o timer.o title.o type.o ver.o \
-          verify.o vol.o where.o window.o cmd.coff
+          set.o shift.o start.o strtoclr.o time.o timer.o title.o type.o \
+          ver.o verify.o vol.o where.o window.o cmd.coff
 
 CLEAN_FILES = *.o cmd.exe cmd.sym cmd.coff
 
 
 cmd.exe: $(OBJECTS)
-       $(CC) $(OBJECTS) -lkernel32 -lcrtdll -luser32 -o cmd.exe
+       $(CC) $(OBJECTS) -lkernel32 -lmsvcrt -luser32 -o cmd.exe
        $(NM) --numeric-sort cmd.exe > cmd.sym
 
 
@@ -40,13 +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