aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2022-09-12 17:45:15 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2022-09-12 17:45:29 +0300
commitda11f7ccbe79705e127afbaa62913b32715b33e1 (patch)
tree6902a18cfac845c9442a407da838d3ec15735d1d
parent0c8a0412dffdd1d7b5bec067960848bfec53ff1f (diff)
Rename version file to version.txt
-rw-r--r--makefile4
-rw-r--r--odb/oracle/makefile2
-rw-r--r--version.txt (renamed from version)0
3 files changed, 3 insertions, 3 deletions
diff --git a/makefile b/makefile
index b22b1bf..d771a39 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 := LICENSE NCUEL README NEWS version
+$(dist): export docs := LICENSE NCUEL README NEWS version.txt
$(dist): data_dist := INSTALL libodb-oracle-vc8.sln libodb-oracle-vc9.sln \
libodb-oracle-vc10.sln libodb-oracle-vc11.sln libodb-oracle-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-oracle.pc.in)
diff --git a/odb/oracle/makefile b/odb/oracle/makefile
index a2ad29a..d4698b0 100644
--- a/odb/oracle/makefile
+++ b/odb/oracle/makefile
@@ -110,7 +110,7 @@ libodb-oracle-vc10.vcxproj libodb-oracle-vc10.vcxproj.filters \
libodb-oracle-vc11.vcxproj libodb-oracle-vc11.vcxproj.filters \
libodb-oracle-vc12.vcxproj libodb-oracle-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))
diff --git a/version b/version.txt
index cd2d927..cd2d927 100644
--- a/version
+++ b/version.txt