aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2022-09-09 17:12:03 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2022-09-09 18:15:48 +0300
commit38e4047e166dbe87a713ab9614cd5b56085af886 (patch)
treea86cb89d9d9b9834d1ee45c8a289a9dcc1c7ec7f
parent942076b7484da1b5c1298fe1bfb73014d84a202d (diff)
Rename version file to version.txt
-rw-r--r--makefile4
-rw-r--r--odb/makefile2
-rw-r--r--version.txt (renamed from version)0
3 files changed, 3 insertions, 3 deletions
diff --git a/makefile b/makefile
index 9376c02..74e1b6e 100644
--- a/makefile
+++ b/makefile
@@ -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-vc8.sln libodb-vc9.sln libodb-vc10.sln \
libodb-vc11.sln libodb-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.pc.in)
diff --git a/odb/makefile b/odb/makefile
index a5e30f5..01b395e 100644
--- a/odb/makefile
+++ b/odb/makefile
@@ -136,7 +136,7 @@ libodb-vc10.vcxproj libodb-vc10.vcxproj.filters \
libodb-vc11.vcxproj libodb-vc11.vcxproj.filters \
libodb-vc12.vcxproj libodb-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):
$(call dist-data,$(sources) $(posix_threads_sources) \
diff --git a/version b/version.txt
index cd2d927..cd2d927 100644
--- a/version
+++ b/version.txt