diff options
| author | Yann Collet <cyan@fb.com> | 2020-11-30 16:09:22 -0800 |
|---|---|---|
| committer | Yann Collet <cyan@fb.com> | 2020-11-30 16:09:22 -0800 |
| commit | 5a551754cf48d020152f48d5bf1e6d99fa6d4c27 (patch) | |
| tree | 9fda1baa7b70c089049970f2ab0108be03e9b685 | |
| parent | e585a438c714652e866a59371b287f52aa4d2dc3 (diff) | |
| parent | 07a2476fe61e0fc0b7e25f411b13619295479064 (diff) | |
| download | lz4-5a551754cf48d020152f48d5bf1e6d99fa6d4c27.tar.gz | |
Merge branch 'dev' into Makefile
remove `LN_S`
| -rw-r--r-- | Makefile.inc | 4 | ||||
| -rw-r--r-- | programs/Makefile | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/Makefile.inc b/Makefile.inc index 338ef560..0840a564 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -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 diff --git a/programs/Makefile b/programs/Makefile index cd274c01..f4711098 100644 --- a/programs/Makefile +++ b/programs/Makefile @@ -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 |