diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4e255db79a..b9ba598e6f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,7 +15,7 @@ else()
endif()
project(Wireshark C CXX)
-# Updated by make-version.pl
+# Updated by tools/make-version.pl
set(GIT_REVISION 0)
set(PROJECT_MAJOR_VERSION 2)
set(PROJECT_MINOR_VERSION 9)
@@ -1503,7 +1503,7 @@ set( VERSION ${PROJECT_VERSION} )
add_custom_target(version
BYPRODUCTS version.h
COMMAND ${PERL_EXECUTABLE}
- ${CMAKE_SOURCE_DIR}/make-version.pl
+ ${CMAKE_SOURCE_DIR}/tools/make-version.pl
${CMAKE_SOURCE_DIR}
)
set_target_properties(version PROPERTIES FOLDER "Auxiliary")
@@ -2821,7 +2821,7 @@ if(RPMBUILD_EXECUTABLE)
execute_process(
COMMAND ${PERL_EXECUTABLE}
- ${CMAKE_SOURCE_DIR}/make-version.pl
+ ${CMAKE_SOURCE_DIR}/tools/make-version.pl
${CMAKE_SOURCE_DIR}
)
diff --git a/appveyor.yml b/appveyor.yml
index d329051441..ea3b19230b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -43,7 +43,7 @@ build:
before_build:
# Write ASCII (not UTF-16). Cannot use cmd due to repeated '%' unescapes.
- ps: echo "pkg_format=-%#-AppVeyor" | Out-File -Encoding ASCII version.conf
- - perl make-version.pl --set-release
+ - perl tools/make-version.pl --set-release
- mkdir build
- cd build
- cmake -E time cmake -G "%CMAKE_GENERATOR%" ..
diff --git a/docbook/developer-guide-docinfo.xml b/docbook/developer-guide-docinfo.xml
index 709c2e02f4..60768aba7f 100644
--- a/docbook/developer-guide-docinfo.xml
+++ b/docbook/developer-guide-docinfo.xml
@@ -1,6 +1,6 @@
-
+
For Wireshark 2.9
diff --git a/docbook/user-guide-docinfo.xml b/docbook/user-guide-docinfo.xml
index cd8d373661..14707734c5 100644
--- a/docbook/user-guide-docinfo.xml
+++ b/docbook/user-guide-docinfo.xml
@@ -1,6 +1,6 @@
-
+
For Wireshark 2.9