projects
/
oweals
/
nmrpflash.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7f75f8b
1679444
)
Merge pull request #37 from real-dam/cross-pkg-config
author
Joseph C. Lehner
<jclehner@users.noreply.github.com>
Mon, 11 May 2020 14:20:26 +0000
(16:20 +0200)
committer
GitHub
<noreply@github.com>
Mon, 11 May 2020 14:20:26 +0000
(16:20 +0200)
Improve cross-building by honoring PKG_CONFIG from environment
1
2
Makefile
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Makefile
index 04ad2d547c5276c83d0b3f4acc023f5240e866bf,640d7cd73a99799eec3d4792748e691b48c620d4..daa4c5d8abff48319d172903df31443a18f19950
---
1
/
Makefile
---
2
/
Makefile
+++ b/
Makefile
@@@
-1,6
-1,7
+1,7
@@@
CC ?= gcc
+ PKG_CONFIG ?= pkg-config
PREFIX ?= /usr/local
-VERSION
= $(shell git describe --always | tail -c +2
)
+VERSION
:= $(shell if [ -d .git ] && which git 2>&1 > /dev/null; then git describe --always | tail -c +2; else echo $$STANDALONE_VERSION; fi
)
LIBS = -lpcap
CFLAGS += -Wall -g -DNMRPFLASH_VERSION=\"$(VERSION)\"
LDFLAGS += $(LIBS)