From 47393b5de42120dfb7d01f8b77aff16ac68177ec Mon Sep 17 00:00:00 2001
From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sat, 25 Jun 2011 00:32:45 +0200
Subject: [PATCH] Add Makefile.am in gui/.

This ensures the gui source will be included in the tarball with make dist,
and will be installed with make install.
---
 Makefile.am     | 4 ++--
 configure.in    | 3 ++-
 gui/Makefile.am | 7 +++++++
 3 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 gui/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d2f9c3b3..e37864d0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,11 +2,11 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS =  m4 src doc
+SUBDIRS =  m4 src doc gui
 
 ACLOCAL_AMFLAGS = -I m4 
 
-EXTRA_DIST = have.h system.h COPYING.README gui
+EXTRA_DIST = have.h system.h COPYING.README
 
 ChangeLog:
 	git log > ChangeLog
diff --git a/configure.in b/configure.in
index 22e5fb1f..edd3bec6 100644
--- a/configure.in
+++ b/configure.in
@@ -20,6 +20,7 @@ AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_RANLIB
+AM_PATH_PYTHON
 
 dnl Check and set OS
 
@@ -172,6 +173,6 @@ AC_ARG_ENABLE(jumbograms,
 
 AC_SUBST(INCLUDES)
 
-AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile m4/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile m4/Makefile gui/Makefile])
 
 AC_OUTPUT
diff --git a/gui/Makefile.am b/gui/Makefile.am
new file mode 100644
index 00000000..e538e8f5
--- /dev/null
+++ b/gui/Makefile.am
@@ -0,0 +1,7 @@
+dist_bin_SCRIPTS = tinc-gui
+
+tinc_gui_PYTHON = Tinc.py
+
+tinc_guidir = $(prefix)/bin
+
+extra_DIST = README.gui
-- 
2.20.1