diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2013-05-24 13:28:08 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2013-05-24 13:28:08 +0200 |
| commit | c0f47b6edfd655a11e53110c935a8764fd834a96 (patch) | |
| tree | f406f35cef9387775d9790d9a67fae14db34f325 /openvpn/Makefile.am | |
| parent | bdfd3ddc08c4a444da62ece0463edb345d12a59f (diff) | |
Updaten OpenVPN version to 2.4master
Diffstat (limited to 'openvpn/Makefile.am')
| -rw-r--r-- | openvpn/Makefile.am | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/openvpn/Makefile.am b/openvpn/Makefile.am index c5805797..1a30aa5a 100644 --- a/openvpn/Makefile.am +++ b/openvpn/Makefile.am @@ -66,7 +66,6 @@ dist_doc_DATA = \ dist_noinst_DATA = \ .gitignore \ .gitattributes \ - config-version.h.in \ PORTS \ README.IPv6 TODO.IPv6 \ README.polarssl \ @@ -91,8 +90,12 @@ root_DATA = version.sh endif config-version.h: - @CONFIGURE_GIT_REVISION="`GIT_DIR=\"$(top_srcdir)/.git\" $(GIT) rev-parse --symbolic-full-name HEAD`/`GIT_DIR=\"$(top_srcdir)/.git\" $(GIT) rev-parse --short=16 HEAD`"; \ - $(SED) "s#@CONFIGURE_GIT_REVISION[@]#$${CONFIGURE_GIT_REVISION}#g" "$(srcdir)/config-version.h.in" > config-version.h.tmp + @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 \"*\"`"; \ + CONFIGURE_GIT_REVISION="`GIT_DIR=\"$(top_srcdir)/.git\" $(GIT) rev-parse --symbolic-full-name HEAD | cut -d/ -f3-`/`GIT_DIR=\"$(top_srcdir)/.git\" $(GIT) rev-parse --short=16 HEAD`"; \ + echo "#define CONFIGURE_GIT_REVISION \"$${CONFIGURE_GIT_REVISION}\"" > config-version.h.tmp; \ + echo "#define CONFIGURE_GIT_FLAGS \"$${CONFIGURE_GIT_CHFILES}$${CONFIGURE_GIT_UNCOMMITTED}\"" >> config-version.h.tmp + @if ! [ -f config-version.h ] || ! cmp -s config-version.h.tmp config-version.h; then \ echo "replacing config-version.h"; \ mv config-version.h.tmp config-version.h; \ |