diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2022-08-19 07:52:23 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2022-08-19 07:52:23 +0200 |
| commit | 4aa84e41c065c51a996f40143cbcce7c281150f3 (patch) | |
| tree | 5d70b43ff1967d7036dbfdfb56bfe1157bd81c05 | |
| parent | 4c8104756b92b9fa16b3a725e8a6aa620dfd606e (diff) | |
Rename version to version.txt not to clash with <version> header
| -rw-r--r-- | cutl/makefile | 2 | ||||
| -rw-r--r-- | makefile | 4 | ||||
| -rw-r--r-- | version.txt (renamed from version) | 0 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cutl/makefile b/cutl/makefile index 436a2e8..0c2a1a0 100644 --- a/cutl/makefile +++ b/cutl/makefile @@ -119,7 +119,7 @@ details/boost/README $(expat_dist) $(genx_dist) $(dist): export extra_dist := $(data_dist) libcutl-vc9.vcproj \ libcutl-vc10.vcxproj libcutl-vc10.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) $(boost_sources) $(expat_sources) $(genx_sources)) @@ -18,11 +18,11 @@ $(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(dirs))) dist_dirs := $(filter-out tests,$(dirs)) $(dist): export dirs := $(dist_dirs) -$(dist): export docs := LICENSE NEWS README INSTALL version +$(dist): export docs := LICENSE NEWS README INSTALL version.txt $(dist): data_dist := libcutl-vc9.sln libcutl-vc10.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,$(dist_dirs))) $(call dist-data,$(docs) $(data_dist) libcutl.pc.in) |