diff options
| author | Przemyslaw Skibinski <inikep@gmail.com> | 2016-11-04 12:32:36 (GMT) |
|---|---|---|
| committer | Przemyslaw Skibinski <inikep@gmail.com> | 2016-11-04 12:32:36 (GMT) |
| commit | e06fcd903909c96a72d1025a81ff8fb31ac572fb (patch) | |
| tree | 441c9cbd7e02772ffba9e4fa35dd6e6cf8b9f447 | |
| parent | e7648f4fcca64b7b87a0591a65e43e0de1e69e82 (diff) | |
| download | lz4-e06fcd903909c96a72d1025a81ff8fb31ac572fb.zip lz4-e06fcd903909c96a72d1025a81ff8fb31ac572fb.tar.gz lz4-e06fcd903909c96a72d1025a81ff8fb31ac572fb.tar.bz2 | |
redefined VOID for Windows/MSYS
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | programs/Makefile | 3 | ||||
| -rw-r--r-- | tests/Makefile | 3 |
3 files changed, 5 insertions, 8 deletions
@@ -30,8 +30,9 @@ # - LZ4 forum froup : https://groups.google.com/forum/#!forum/lz4c # ################################################################ -DESTDIR?= -PREFIX ?= /usr/local +DESTDIR ?= +PREFIX ?= /usr/local +VOID := /dev/null LIBDIR ?= $(PREFIX)/lib INCLUDEDIR=$(PREFIX)/include @@ -43,10 +44,8 @@ TESTDIR = tests # Define nul output ifneq (,$(filter Windows%,$(OS))) EXT = .exe -VOID = nul else EXT = -VOID = /dev/null endif diff --git a/programs/Makefile b/programs/Makefile index ba01b40..531533c 100644 --- a/programs/Makefile +++ b/programs/Makefile @@ -29,6 +29,7 @@ DESTDIR ?= PREFIX ?= /usr/local +VOID := /dev/null BINDIR := $(PREFIX)/bin MANDIR := $(PREFIX)/share/man/man1 LZ4DIR := ../lib @@ -43,10 +44,8 @@ FLAGS := $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) # Define *.exe as extension for Windows systems ifneq (,$(filter Windows%,$(OS))) EXT =.exe -VOID = nul else EXT = -VOID = /dev/null endif diff --git a/tests/Makefile b/tests/Makefile index 0c44b21..f8d7015 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -33,6 +33,7 @@ DESTDIR ?= PREFIX ?= /usr/local +VOID := /dev/null BINDIR := $(PREFIX)/bin MANDIR := $(PREFIX)/share/man/man1 LZ4DIR := ../lib @@ -50,10 +51,8 @@ FLAGS := $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) # Define *.exe as extension for Windows systems ifneq (,$(filter Windows%,$(OS))) EXT =.exe -VOID = nul else EXT = -VOID = /dev/null endif |