summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorYann Collet <yann.collet.73@gmail.com>2014-08-06 08:06:00 (GMT)
committerYann Collet <yann.collet.73@gmail.com>2014-08-06 08:06:00 (GMT)
commit3897eb6e9b48b20cb5382964a8c6d671e748d690 (patch)
tree87621f9eb5d708b1260b1e87c848153538d6a31e /Makefile
parent4ea832b8ff1d43c779a1c41dc3e3d6ff418143a4 (diff)
downloadlz4-3897eb6e9b48b20cb5382964a8c6d671e748d690.zip
lz4-3897eb6e9b48b20cb5382964a8c6d671e748d690.tar.gz
lz4-3897eb6e9b48b20cb5382964a8c6d671e748d690.tar.bz2
Makefile : restored Takayuki's fix for OS-X and BSD
minor display change for make install
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 5 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index ebbe44d..b2b64e7 100644
--- a/Makefile
+++ b/Makefile
@@ -33,9 +33,9 @@
# Version numbers
VERSION=121
export RELEASE=r$(VERSION)
-LIBVER_MAJOR=`sed -n '/LZ4_VERSION_MAJOR/s/.*\s\+\([0-9]\+\).*/\1/p' < lz4.h`
-LIBVER_MINOR=`sed -n '/LZ4_VERSION_MINOR/s/.*\s\+\([0-9]\+\).*/\1/p' < lz4.h`
-LIBVER_PATCH=`sed -n '/LZ4_VERSION_RELEASE/s/.*\s\+\([0-9]\+\).*/\1/p' < lz4.h`
+LIBVER_MAJOR=`sed -n '/define LZ4_VERSION_MAJOR/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < lz4.h`
+LIBVER_MINOR=`sed -n '/define LZ4_VERSION_MINOR/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < lz4.h`
+LIBVER_PATCH=`sed -n '/define LZ4_VERSION_RELEASE/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < lz4.h`
LIBVER=$(LIBVER_MAJOR).$(LIBVER_MINOR).$(LIBVER_PATCH)
DESTDIR=
@@ -115,7 +115,8 @@ clean:
ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU))
liblz4.pc: liblz4.pc.in Makefile
- sed -e 's|@PREFIX@|$(PREFIX)|' \
+ @echo creating pkgconfig
+ @sed -e 's|@PREFIX@|$(PREFIX)|' \
-e 's|@LIBDIR@|$(LIBDIR)|' \
-e 's|@INCLUDEDIR@|$(INCLUDEDIR)|' \
-e 's|@VERSION@|$(VERSION)|' \