diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2022-09-09 16:10:14 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2022-09-09 18:14:22 +0300 |
| commit | 0700ddb5cbe6b1ea2f5abe765ce498445f359e30 (patch) | |
| tree | bc45561772f435267e2fc9c45c549d4e807ab537 | |
| parent | 51545ab70cb1af3dc72abc11a002c7a3b15bacc7 (diff) | |
Rename version file to version.txt
| -rw-r--r-- | makefile | 4 | ||||
| -rw-r--r-- | odb/sqlite/makefile | 2 | ||||
| -rw-r--r-- | version.txt (renamed from version) | 0 |
3 files changed, 3 insertions, 3 deletions
@@ -12,13 +12,13 @@ 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-sqlite-vc8.sln libodb-sqlite-vc9.sln \ libodb-sqlite-vc10.sln libodb-sqlite-vc11.sln libodb-sqlite-vc12.sln \ $(subst $(src_base)/,,$(shell find $(src_base)/etc -type f)) $(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-sqlite.pc.in) diff --git a/odb/sqlite/makefile b/odb/sqlite/makefile index cead138..485b9ec 100644 --- a/odb/sqlite/makefile +++ b/odb/sqlite/makefile @@ -111,7 +111,7 @@ libodb-sqlite-vc10.vcxproj libodb-sqlite-vc10.vcxproj.filters \ libodb-sqlite-vc11.vcxproj libodb-sqlite-vc11.vcxproj.filters \ libodb-sqlite-vc12.vcxproj libodb-sqlite-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)) |