diff options
| -rw-r--r-- | makefile | 4 | ||||
| -rw-r--r-- | odb/mysql/makefile | 2 | ||||
| -rw-r--r-- | version.txt (renamed from version) | 0 |
3 files changed, 3 insertions, 3 deletions
@@ -12,12 +12,12 @@ clean := $(out_base)/.clean $(default): $(addprefix $(out_base)/,$(addsuffix /,$(dirs))) $(dist): export dirs := $(dirs) -$(dist): export docs := GPLv2 LICENSE README NEWS version +$(dist): export docs := GPLv2 LICENSE README NEWS version.txt $(dist): data_dist := INSTALL libodb-mysql-vc8.sln libodb-mysql-vc9.sln \ libodb-mysql-vc10.sln libodb-mysql-vc11.sln libodb-mysql-vc12.sln $(dist): exec_dist := bootstrap $(dist): export extra_dist := $(data_dist) $(exec_dist) -$(dist): export version = $(shell cat $(src_root)/version) +$(dist): export version = $(shell cat $(src_root)/version.txt) $(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(dirs))) $(call dist-data,$(docs) $(data_dist) libodb-mysql.pc.in) diff --git a/odb/mysql/makefile b/odb/mysql/makefile index d0eeab3..2a8f6bf 100644 --- a/odb/mysql/makefile +++ b/odb/mysql/makefile @@ -112,7 +112,7 @@ libodb-mysql-vc10.vcxproj libodb-mysql-vc10.vcxproj.filters \ libodb-mysql-vc11.vcxproj libodb-mysql-vc11.vcxproj.filters \ libodb-mysql-vc12.vcxproj libodb-mysql-vc12.vcxproj.filters $(dist): export interface_version = $(shell sed -e \ -'s/^\([0-9]*\.[0-9]*\).*/\1/' $(src_root)/version) +'s/^\([0-9]*\.[0-9]*\).*/\1/' $(src_root)/version.txt) $(dist): $(gen) $(call dist-data,$(sources_dist) $(headers_dist) $(data_dist)) |