diff options
Diffstat (limited to 'src/3rdparty/freetype/builds/toplevel.mk')
| -rw-r--r-- | src/3rdparty/freetype/builds/toplevel.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/3rdparty/freetype/builds/toplevel.mk b/src/3rdparty/freetype/builds/toplevel.mk index e6a8e932f7..6a8280173d 100644 --- a/src/3rdparty/freetype/builds/toplevel.mk +++ b/src/3rdparty/freetype/builds/toplevel.mk @@ -177,9 +177,9 @@ include $(TOP_DIR)/builds/modules.mk ifneq ($(findstring distx,$(MAKECMDGOALS)x),) FT_H := include/freetype/freetype.h - major := $(shell sed -n 's/.*FREETYPE_MAJOR.*\([0-9]\+\)/\1/p' < $(FT_H)) - minor := $(shell sed -n 's/.*FREETYPE_MINOR.*\([0-9]\+\)/\1/p' < $(FT_H)) - patch := $(shell sed -n 's/.*FREETYPE_PATCH.*\([0-9]\+\)/\1/p' < $(FT_H)) + major := $(shell sed -n 's/.*FREETYPE_MAJOR[^0-9]*\([0-9]\+\)/\1/p' < $(FT_H)) + minor := $(shell sed -n 's/.*FREETYPE_MINOR[^0-9]*\([0-9]\+\)/\1/p' < $(FT_H)) + patch := $(shell sed -n 's/.*FREETYPE_PATCH[^0-9]*\([0-9]\+\)/\1/p' < $(FT_H)) version := $(major).$(minor).$(patch) winversion := $(major)$(minor)$(patch) @@ -191,14 +191,14 @@ dist: rm -f freetype-$(version).tar.bz2 rm -f ft$(winversion).zip - for d in `find . -wholename '*/CVS' -prune \ + for d in `find . -wholename '*/.git' -prune \ -o -type f \ -o -print` ; do \ mkdir -p tmp/$$d ; \ done ; currdir=`pwd` ; \ - for f in `find . -wholename '*/CVS' -prune \ + for f in `find . -wholename '*/.git' -prune \ -o -name .cvsignore \ -o -type d \ -o -print` ; do \ |