diff options
| author | Yann Collet <yann.collet.73@gmail.com> | 2014-11-30 22:32:12 (GMT) |
|---|---|---|
| committer | Yann Collet <yann.collet.73@gmail.com> | 2014-11-30 22:32:12 (GMT) |
| commit | d008c87151abf8c36a9f98d28461bf6f3dfdc6ae (patch) | |
| tree | f9cbf5a95577a4bbbe610b1dca00e1f332e56623 /programs | |
| parent | 80030c16fff7a8a5dae18cf2b1ab5da508137847 (diff) | |
| download | lz4-d008c87151abf8c36a9f98d28461bf6f3dfdc6ae.zip lz4-d008c87151abf8c36a9f98d28461bf6f3dfdc6ae.tar.gz lz4-d008c87151abf8c36a9f98d28461bf6f3dfdc6ae.tar.bz2 | |
New directory structure : library source files into /lib directory
Diffstat (limited to 'programs')
| -rw-r--r-- | programs/Makefile | 4 | ||||
| -rw-r--r-- | programs/lz4cli.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/programs/Makefile b/programs/Makefile index 9001e2c..96de0e3 100644 --- a/programs/Makefile +++ b/programs/Makefile @@ -37,11 +37,11 @@ PREFIX ?= /usr CC := $(CC) CFLAGS ?= -O3 CFLAGS += -std=c99 -Wall -Wextra -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -DLZ4_VERSION=\"$(RELEASE)\" -FLAGS = -I.. $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) +FLAGS = -I../lib $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) BINDIR=$(PREFIX)/bin MANDIR=$(PREFIX)/share/man/man1 -LZ4DIR=.. +LZ4DIR=../lib TEST_FILES = COPYING TEST_TARGETS=test-native diff --git a/programs/lz4cli.c b/programs/lz4cli.c index 8a8fc27..e69a84a 100644 --- a/programs/lz4cli.c +++ b/programs/lz4cli.c @@ -288,7 +288,7 @@ int main(int argc, char** argv) legacy_format=0, forceStdout=0, forceCompress=0, - pause=0; + main_pause=0; char* input_filename=0; char* output_filename=0; char* dynNameSpace=0; @@ -424,7 +424,7 @@ int main(int argc, char** argv) break; // Pause at the end (hidden option) - case 'p': pause=1; BMK_SetPause(); break; + case 'p': main_pause=1; BMK_SetPause(); break; EXTENDED_ARGUMENTS; @@ -517,7 +517,7 @@ int main(int argc, char** argv) } } - if (pause) waitEnter(); + if (main_pause) waitEnter(); free(dynNameSpace); return 0; } |