mirror of
https://github.com/notepad-plus-plus/notepad-plus-plus.git
synced 2025-04-08 17:15:37 +02:00
fix invalid path + info
This commit is contained in:
parent
be05d49d23
commit
679cc48ff7
@ -25,7 +25,7 @@ SRC_EXCLUDE := $(SRC_DIRECTORY)/tools/%
|
||||
BIN_DIRECTORY := ../bin
|
||||
INSTALLER_DIRECTORY := ../installer
|
||||
|
||||
PREBUILD_EVENT_CMD := ../src/NppLibsVersionH-generator.bat
|
||||
PREBUILD_EVENT_CMD := NppLibsVersionH-generator.bat
|
||||
|
||||
TARGET_BINARY := notepad++.exe
|
||||
SRC_DATA := contextMenu.xml langs.model.xml shortcuts.xml stylers.model.xml tabContextMenu_example.xml toolbarIcons.xml
|
||||
@ -184,6 +184,7 @@ ifeq "$(WIN_DIR)" ""
|
||||
MKDIR := mkdir -p
|
||||
CPDIR := cp -r
|
||||
RMDIR := rm -rf
|
||||
DIR := ls -l
|
||||
CP := cp
|
||||
RM := rm -f
|
||||
normalize-path = $1
|
||||
@ -195,6 +196,7 @@ 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
|
||||
normalize-path = $1
|
||||
@ -203,6 +205,7 @@ else
|
||||
MKDIR := mkdir
|
||||
CPDIR := xcopy /q /e /i /y
|
||||
RMDIR := rmdir /q /s
|
||||
DIR := dir
|
||||
CP := copy /y
|
||||
RM := del /q
|
||||
normalize-path = $(subst /,\,$1)
|
||||
@ -237,7 +240,8 @@ all: pre-build-event $(SCINTILLA_TARGET) $(LEXILLA_TARGET)
|
||||
|
||||
pre-build-event:
|
||||
@echo Executing pre-build events...
|
||||
$(AT)$(call normalize-path,$(PREBUILD_EVENT_CMD))
|
||||
@$(DIR)
|
||||
$(AT)$(call normalize-path,$(SRC_DIRECTORY)/$(PREBUILD_EVENT_CMD))
|
||||
|
||||
$(BUILD_DIRECTORY):
|
||||
@echo + creating BUILD_DIRECTORY $@
|
||||
|
Loading…
x
Reference in New Issue
Block a user