Merge branch 'dev' into Makefile

remove `LN_S`
This commit is contained in:
Yann Collet 2020-11-30 16:09:22 -08:00
commit 5a551754cf
2 changed files with 3 additions and 7 deletions

View File

@ -85,18 +85,14 @@ endif
# Avoid symlinks when targetting Windows or building on a Windows host
ifeq ($(WINBASED),yes)
LN_S = cp -p
LN_SF = cp -p
else
ifneq (,$(filter MINGW% MSYS% CYGWIN%,$(shell uname)))
LN_S = cp -p
LN_SF = cp -p
else
ifneq (,$(filter Windows%,$(OS)))
LN_S = cp -p
LN_SF = cp -p
else
LN_S = ln -s
LN_SF = ln -sf
endif
endif

View File

@ -167,9 +167,9 @@ install: lz4
@echo Installing binaries
$(INSTALL_DIR) $(DESTDIR)$(bindir)/ $(DESTDIR)$(man1dir)/
$(INSTALL_PROGRAM) lz4$(EXT) $(DESTDIR)$(bindir)/lz4$(EXT)
$(LN_S) lz4$(EXT) $(DESTDIR)$(bindir)/lz4c$(EXT)
$(LN_S) lz4$(EXT) $(DESTDIR)$(bindir)/lz4cat$(EXT)
$(LN_S) lz4$(EXT) $(DESTDIR)$(bindir)/unlz4$(EXT)
$(LN_SF) lz4$(EXT) $(DESTDIR)$(bindir)/lz4c$(EXT)
$(LN_SF) lz4$(EXT) $(DESTDIR)$(bindir)/lz4cat$(EXT)
$(LN_SF) lz4$(EXT) $(DESTDIR)$(bindir)/unlz4$(EXT)
@echo Installing man pages
$(INSTALL_DATA) lz4.1 $(DESTDIR)$(man1dir)/lz4.1
$(LN_SF) lz4.1 $(DESTDIR)$(man1dir)/lz4c.1