diff options
| author | Yann Collet <yann.collet.73@gmail.com> | 2016-01-15 15:41:27 (GMT) |
|---|---|---|
| committer | Yann Collet <yann.collet.73@gmail.com> | 2016-01-15 15:41:27 (GMT) |
| commit | ad564c872089f61f1142c3544b9fd140093bd162 (patch) | |
| tree | 0c0f6371c02c24bdf608765b24223a50fc795636 | |
| parent | db53bbb946906db69a8c2cf6a09f0c93d28cf94c (diff) | |
| parent | b84eb3349265fc6c4cae066025eb9ecb4719d8fc (diff) | |
| download | lz4-ad564c872089f61f1142c3544b9fd140093bd162.zip lz4-ad564c872089f61f1142c3544b9fd140093bd162.tar.gz lz4-ad564c872089f61f1142c3544b9fd140093bd162.tar.bz2 | |
Merge branch 'dev' of github.com:Cyan4973/lz4 into dev
| -rw-r--r-- | programs/Makefile | 18 | ||||
| -rw-r--r-- | programs/lz4io.c | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/programs/Makefile b/programs/Makefile index 27d5922..2cf8e55 100644 --- a/programs/Makefile +++ b/programs/Makefile @@ -116,13 +116,13 @@ clean: #make install is validated only for Linux, OSX, kFreeBSD and Hurd targets ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU)) -install: lz4 lz4c +install: lz4$(EXT) lz4c$(EXT) @echo Installing binaries @install -d -m 755 $(DESTDIR)$(BINDIR)/ $(DESTDIR)$(MANDIR)/ - @install -m 755 lz4 $(DESTDIR)$(BINDIR)/lz4 - @ln -sf lz4 $(DESTDIR)$(BINDIR)/lz4cat - @ln -sf lz4 $(DESTDIR)$(BINDIR)/unlz4 - @install -m 755 lz4c $(DESTDIR)$(BINDIR)/lz4c + @install -m 755 lz4$(EXT) $(DESTDIR)$(BINDIR)/lz4$(EXT) + @ln -sf lz4$(EXT) $(DESTDIR)$(BINDIR)/lz4cat$(EXT) + @ln -sf lz4$(EXT) $(DESTDIR)$(BINDIR)/unlz4$(EXT) + @install -m 755 lz4c$(EXT) $(DESTDIR)$(BINDIR)/lz4c$(EXT) @echo Installing man pages @install -m 644 lz4.1 $(DESTDIR)$(MANDIR)/lz4.1 @ln -sf lz4.1 $(DESTDIR)$(MANDIR)/lz4c.1 @@ -131,10 +131,10 @@ install: lz4 lz4c @echo lz4 installation completed uninstall: - rm -f $(DESTDIR)$(BINDIR)/lz4cat - rm -f $(DESTDIR)$(BINDIR)/unlz4 - [ -x $(DESTDIR)$(BINDIR)/lz4 ] && rm -f $(DESTDIR)$(BINDIR)/lz4 - [ -x $(DESTDIR)$(BINDIR)/lz4c ] && rm -f $(DESTDIR)$(BINDIR)/lz4c + rm -f $(DESTDIR)$(BINDIR)/lz4cat$(EXT) + rm -f $(DESTDIR)$(BINDIR)/unlz4$(EXT) + [ -x $(DESTDIR)$(BINDIR)/lz4$(EXT) ] && rm -f $(DESTDIR)$(BINDIR)/lz4$(EXT) + [ -x $(DESTDIR)$(BINDIR)/lz4c$(EXT) ] && rm -f $(DESTDIR)$(BINDIR)/lz4c$(EXT) [ -f $(DESTDIR)$(MANDIR)/lz4.1 ] && rm -f $(DESTDIR)$(MANDIR)/lz4.1 rm -f $(DESTDIR)$(MANDIR)/lz4c.1 rm -f $(DESTDIR)$(MANDIR)/lz4cat.1 diff --git a/programs/lz4io.c b/programs/lz4io.c index 14bbf0e..e4823dc 100644 --- a/programs/lz4io.c +++ b/programs/lz4io.c @@ -66,7 +66,7 @@ # include <io.h> /* _setmode, _fileno, _get_osfhandle */ # if !defined(__DJGPP__) # define SET_BINARY_MODE(file) { int unused=_setmode(_fileno(file), _O_BINARY); (void)unused; } -# include <Windows.h> /* DeviceIoControl, HANDLE, FSCTL_SET_SPARSE */ +# include <windows.h> /* DeviceIoControl, HANDLE, FSCTL_SET_SPARSE */ # define SET_SPARSE_FILE_MODE(file) { DWORD dw; DeviceIoControl((HANDLE) _get_osfhandle(_fileno(file)), FSCTL_SET_SPARSE, 0, 0, 0, 0, &dw, 0); } # if defined(_MSC_VER) && (_MSC_VER >= 1400) /* Avoid MSVC fseek()'s 2GiB barrier */ # define fseek _fseeki64 |