aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--makefile4
-rw-r--r--odb/pgsql/makefile2
-rw-r--r--version.txt (renamed from version)0
3 files changed, 3 insertions, 3 deletions
diff --git a/makefile b/makefile
index f597bdd..4031289 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-pgsql-vc8.sln libodb-pgsql-vc9.sln \
libodb-pgsql-vc10.sln libodb-pgsql-vc11.sln libodb-pgsql-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-pgsql.pc.in)
diff --git a/odb/pgsql/makefile b/odb/pgsql/makefile
index d53eff6..acd23f6 100644
--- a/odb/pgsql/makefile
+++ b/odb/pgsql/makefile
@@ -109,7 +109,7 @@ libodb-pgsql-vc10.vcxproj libodb-pgsql-vc10.vcxproj.filters \
libodb-pgsql-vc11.vcxproj libodb-pgsql-vc11.vcxproj.filters \
libodb-pgsql-vc12.vcxproj libodb-pgsql-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