diff --git a/src/makefile b/src/makefile index 294dc086..e1c621d4 100644 --- a/src/makefile +++ b/src/makefile @@ -50,8 +50,10 @@ STLIB_MAKE_CMD=ar rcs $(STLIBNAME) PREFIX?=/usr/local INCLUDE_PATH?=include LIBRARY_PATH?=lib +BINARY_PATH?=bin INSTALL_INCLUDE_PATH= $(PREFIX)/$(INCLUDE_PATH) INSTALL_LIBRARY_PATH= $(PREFIX)/$(LIBRARY_PATH) +INSTALL_BINARY_PATH= $(PREFIX)/$(BINARY_PATH) # Platform-specific overrides uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') @@ -166,8 +168,9 @@ endif INSTALL?= cp -a install: $(DYLIBNAME) $(STLIBNAME) - mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_LIBRARY_PATH) + mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_LIBRARY_PATH) $(INSTALL_BINARY_PATH) $(INSTALL) zlog.h $(INSTALL_INCLUDE_PATH) + $(INSTALL) zlog-chk-conf $(INSTALL_BINARY_PATH) $(INSTALL) $(DYLIBNAME) $(INSTALL_LIBRARY_PATH)/$(DYLIB_MINOR_NAME) cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MINOR_NAME) $(DYLIB_MAJOR_NAME) cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MAJOR_NAME) $(DYLIBNAME) diff --git a/test/test_tmp.c b/test/test_tmp.c old mode 100644 new mode 100755 index 19b07ea7..53403be5 --- a/test/test_tmp.c +++ b/test/test_tmp.c @@ -28,7 +28,7 @@ int main(int argc, char** argv) return -2; } - zlog_debug(zc, "%s%d"); + zlog_debug(zc, "%s%d", "hello, zlog ", 1); zlog_info(zc, "hello, zlog 2"); sleep(1);