Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add zlog-chk-conf binary file to install directory #90

Merged
merged 3 commits into from Sep 6, 2016
Merged

add zlog-chk-conf binary file to install directory #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8003e06
add zlog-chk-conf binary file to install directory
Aug 24, 2016
b46f254
Merge pull request #1 from HardySimpson/master
Aug 24, 2016
172832e
repair the argument warning which zlog_debug(zc, %s%d) statement brings
Aug 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/makefile
View file
Open in desktop
Expand Up @@ -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')
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion test/test_tmp.c 100644 → 100755
View file
Open in desktop
Expand Up @@ -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);
Expand Down