diff mbox series

[Openvpn-devel] version.sh: remove

Message ID 20230330094226.487951-1-frank@lichtenheld.com
State Accepted
Headers
Series [Openvpn-devel] version.sh: remove |

Commit Message

Frank Lichtenheld March 30, 2023, 9:42 a.m. UTC 
  This was added back in commit
6187644b660ce284d0a706811eae2dce7cb411b2
to support the NSIS windows installer.

It is now unused.

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
---
 .gitignore    | 1 -
 Makefile.am   | 5 -----
 configure.ac  | 1 -
 version.sh.in | 4 ----
 4 files changed, 11 deletions(-)
 delete mode 100644 version.sh.in

Fallout of my quest to understand all users of version.m4

Comments

Gert Doering March 30, 2023, 11:39 a.m. UTC | #1 
Acked-by: Gert Doering <gert@greenie.muc.de>

Tested on a normal MinGW build (no MSI installers, just openvpn.exe)
and this still works, as do GHA builds.

Your patch has been applied to the master branch.

commit 93343fdf00f44a683faf12c448a31ef66f6e39ee
Author: Frank Lichtenheld
Date:   Thu Mar 30 11:42:26 2023 +0200

     version.sh: remove

     Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
     Acked-by: Gert Doering <gert@greenie.muc.de>
     Message-Id: <20230330094226.487951-1-frank@lichtenheld.com>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg26560.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering
diff mbox series

Patch

diff --git a/.gitignore b/.gitignore
index 813413fe..bedbf519 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,7 +46,6 @@  m4/ltversion.m4
 m4/lt~obsolete.m4
 vcpkg_installed
 
-version.sh
 msvc-env-local.bat
 config-msvc-local.h
 config-msvc-version.h
diff --git a/Makefile.am b/Makefile.am
index 4ffe5118..297c3399 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -70,11 +70,6 @@  dist_noinst_HEADERS = \
 	config-msvc.h \
 	config-msvc-version.h.in
 
-if WIN32
-rootdir=$(prefix)
-root_DATA = version.sh
-endif
-
 config-version.h:
 	@CONFIGURE_GIT_CHFILES="`GIT_DIR=\"$(top_srcdir)/.git\" $(GIT) diff-files --name-status -r --ignore-submodules --quiet -- || echo \"+\"`"; \
 	CONFIGURE_GIT_UNCOMMITTED="`GIT_DIR=\"$(top_srcdir)/.git\" $(GIT) diff-index --cached  --quiet --ignore-submodules HEAD || echo \"*\"`"; \
diff --git a/configure.ac b/configure.ac
index e1e79ebf..50bccc72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1502,7 +1502,6 @@  AC_SUBST([TEST_LDFLAGS])
 AC_SUBST([TEST_CFLAGS])
 
 AC_CONFIG_FILES([
-	version.sh
 	Makefile
 	build/Makefile
 	build/msvc/Makefile
diff --git a/version.sh.in b/version.sh.in
deleted file mode 100644
index 2af5a364..00000000
--- a/version.sh.in
+++ /dev/null
@@ -1,4 +0,0 @@ 
-OPENVPN_PACKAGE_NAME="@PACKAGE_NAME@"
-OPENVPN_PACKAGE_TARNAME="@PACKAGE_TARNAME@"
-OPENVPN_PACKAGE_VERSION="@PACKAGE_VERSION@"
-OPENVPN_PACKAGE_HOST="@host@"