Skip to content
Snippets Groups Projects
Commit 68d98467 authored by Joshua Colp's avatar Joshua Colp Committed by Gerrit Code Review
Browse files

Merge "Build System: Resolve conflict between DESTDIR and bundled jansson."

parents 2969d2ac 28b32fbd
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
third-party/jansson/Makefile
+ 1
− 1
View file @ 68d98467
...@@ -55,7 +55,7 @@ SHELL_ECHO_PREFIX := echo '[jansson] ' ...@@ -55,7 +55,7 @@ SHELL_ECHO_PREFIX := echo '[jansson] '
dest/include/jansson.h: source/config.status dest/include/jansson.h: source/config.status
$(ECHO_PREFIX) Building bundled jansson. $(ECHO_PREFIX) Building bundled jansson.
$(CMD_PREFIX) (cd source; make $(REALLY_QUIET)) $(CMD_PREFIX) (cd source; make $(REALLY_QUIET))
$(CMD_PREFIX) (cd source; make install $(REALLY_QUIET)) $(CMD_PREFIX) (cd source; make install DESTDIR= $(REALLY_QUIET))
.DELETE_ON_ERROR: .DELETE_ON_ERROR:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment