RusstopiaLabs
/
xs
mirror of https://gogs.blitter.com/RLabs/xs
1
0
Fork 0
Code Issues Releases Wiki Activity

Use GOOS in makefile rather than MSYS for Windows MSYS/CYGWIN detection

This commit is contained in:
Russ Magee 2024-10-27 12:37:49 -07:00
parent f07aa457b3
commit 8e96e4fb32
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -43,13 +43,6 @@ ifeq ($(GOOS),)
endif endif
ifeq ($(GOOS),windows) ifeq ($(GOOS),windows)
ifeq ($(MSYSTEM),MSYS)
WIN_MSYS=1
endif
endif
ifdef WIN_MSYS
INSTPREFIX = /usr INSTPREFIX = /usr
else else
INSTPREFIX = /usr/local INSTPREFIX = /usr/local
@ -85,7 +78,7 @@ client: common
server: common server: common
ifeq ($(MSYSTEM),MSYS) ifeq ($(GOOS),windows)
echo "Build of xsd server for Windows not yet supported" echo "Build of xsd server for Windows not yet supported"
else else
$(MAKE) BUILDOPTS=$(BUILDOPTS) -C xsd $(MAKE) BUILDOPTS=$(BUILDOPTS) -C xsd
@ -110,11 +103,10 @@ lint:
reinstall: uninstall install reinstall: uninstall install
install: install:
echo "WIN_MSYS:" $(WIN_MSYS) ifeq ($(GOOS),windows)
ifdef WIN_MSYS
cp xs/xs $(INSTPREFIX)/bin/xs cp xs/xs $(INSTPREFIX)/bin/xs
cp xs/xs $(INSTPREFIX)/bin/xc cp xs/xs $(INSTPREFIX)/bin/xc
echo "Install of xsd server for Windows not yet supported" @echo "Install of xsd server for Windows not yet supported"
else else
cp xs/xs $(INSTPREFIX)/bin cp xs/xs $(INSTPREFIX)/bin
cd $(INSTPREFIX)/bin && ln -s xs xc && cd - cd $(INSTPREFIX)/bin && ln -s xs xc && cd -