mirror of
https://github.com/notepad-plus-plus/notepad-plus-plus.git
synced 2025-04-08 17:15:37 +02:00
fix batch-file launching dir, remove info
This commit is contained in:
parent
679cc48ff7
commit
a1eb96db16
@ -184,9 +184,9 @@ ifeq "$(WIN_DIR)" ""
|
||||
MKDIR := mkdir -p
|
||||
CPDIR := cp -r
|
||||
RMDIR := rm -rf
|
||||
DIR := ls -l
|
||||
CP := cp
|
||||
RM := rm -f
|
||||
CD-PREBUILD := PowerEditor/src
|
||||
normalize-path = $1
|
||||
else ifneq "$(wildcard $(dir $(SHELL))ls.exe)" ""
|
||||
# a Windows system with a proper shell
|
||||
@ -196,18 +196,18 @@ SHELL_DIRECTORY := $(subst |,$(SPACE),$(dir $(subst $(SPACE),|,$(SHELL))))
|
||||
MKDIR := $(SHELL_DIRECTORY)mkdir.exe -p
|
||||
CPDIR := $(SHELL_DIRECTORY)cp.exe -r
|
||||
RMDIR := $(SHELL_DIRECTORY)rm.exe -rf
|
||||
DIR := $(SHELL_DIRECTORY)ls -l
|
||||
CP := $(SHELL_DIRECTORY)cp.exe
|
||||
RM := $(SHELL_DIRECTORY)rm.exe -f
|
||||
CD-PREBUILD := PowerEditor/src
|
||||
normalize-path = $1
|
||||
else
|
||||
# a standard Windows system
|
||||
MKDIR := mkdir
|
||||
CPDIR := xcopy /q /e /i /y
|
||||
RMDIR := rmdir /q /s
|
||||
DIR := dir
|
||||
CP := copy /y
|
||||
RM := del /q
|
||||
CD-PREBUILD := ../src
|
||||
normalize-path = $(subst /,\,$1)
|
||||
endif
|
||||
|
||||
@ -240,8 +240,7 @@ all: pre-build-event $(SCINTILLA_TARGET) $(LEXILLA_TARGET)
|
||||
|
||||
pre-build-event:
|
||||
@echo Executing pre-build events...
|
||||
@$(DIR)
|
||||
$(AT)$(call normalize-path,$(SRC_DIRECTORY)/$(PREBUILD_EVENT_CMD))
|
||||
@cd $(CD-PREBUILD) && $(PREBUILD_EVENT_CMD)
|
||||
|
||||
$(BUILD_DIRECTORY):
|
||||
@echo + creating BUILD_DIRECTORY $@
|
||||
|
Loading…
x
Reference in New Issue
Block a user