[Openvpn-devel] [PATCH 51/52] build: distribute samples in windows

2012-02-29 Thread Alon Bar-Lev

Signed-off-by: Alon Bar-Lev 
---
 configure.ac   |3 +++
 sample/Makefile.am |   14 ++
 2 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0f2a62e..2b095a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -903,6 +903,9 @@ AC_SUBST([OPTIONAL_PKCS11_HELPER_LIBS])

 AM_CONDITIONAL([WIN32], [test "${WIN32}" = "yes"])

+sampledir="\$(docdir)/sample"
+AC_SUBST([sampledir])
+
 AC_CONFIG_FILES([
version.sh
Makefile
diff --git a/sample/Makefile.am b/sample/Makefile.am
index 5df8d9c..8e35bfc 100644
--- a/sample/Makefile.am
+++ b/sample/Makefile.am
@@ -17,3 +17,17 @@ EXTRA_DIST = \
sample-windows \
sample-keys \
sample-scripts
+
+if WIN32
+sample_DATA = \
+   client.ovpn \
+   server.ovpn \
+   sample-windows/sample.ovpn
+
+client.ovpn: sample-config-files/client.conf
+   -rm -f client.ovpn
+   cp "$(srcdir)/sample-config-files/client.conf" client.ovpn
+server.ovpn: sample-config-files/server.conf
+   -rm -f server.ovpn
+   cp "$(srcdir)/sample-config-files/server.conf" server.ovpn
+endif
-- 
1.7.3.4




Re: [Openvpn-devel] [PATCH 51/52] build: distribute samples in windows

2012-03-08 Thread Samuli Seppänen
So, this essentially makes sure client.conf and server.conf are included
in Windows (installers) as client.ovpn and server.ovpn?

If so, ACK.

-- 
Samuli Seppänen
Community Manager
OpenVPN Technologies, Inc

irc freenode net: mattock




> Signed-off-by: Alon Bar-Lev 
> ---
>  configure.ac   |3 +++
>  sample/Makefile.am |   14 ++
>  2 files changed, 17 insertions(+), 0 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 0f2a62e..2b095a3 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -903,6 +903,9 @@ AC_SUBST([OPTIONAL_PKCS11_HELPER_LIBS])
>  
>  AM_CONDITIONAL([WIN32], [test "${WIN32}" = "yes"])
>  
> +sampledir="\$(docdir)/sample"
> +AC_SUBST([sampledir])
> +
>  AC_CONFIG_FILES([
>   version.sh
>   Makefile
> diff --git a/sample/Makefile.am b/sample/Makefile.am
> index 5df8d9c..8e35bfc 100644
> --- a/sample/Makefile.am
> +++ b/sample/Makefile.am
> @@ -17,3 +17,17 @@ EXTRA_DIST = \
>   sample-windows \
>   sample-keys \
>   sample-scripts
> +
> +if WIN32
> +sample_DATA = \
> + client.ovpn \
> + server.ovpn \
> + sample-windows/sample.ovpn
> +
> +client.ovpn: sample-config-files/client.conf
> + -rm -f client.ovpn
> + cp "$(srcdir)/sample-config-files/client.conf" client.ovpn
> +server.ovpn: sample-config-files/server.conf
> + -rm -f server.ovpn
> + cp "$(srcdir)/sample-config-files/server.conf" server.ovpn
> +endif