From 7fa782eb095df099b3121c6b13bc2f8e53713642 Mon Sep 17 00:00:00 2001
From: garden <garden@d37a7db1-d92d-0410-89df-f68f52f87b57>
Date: Fri, 13 Oct 2006 16:15:25 +0000
Subject: [PATCH] corrections for deb package

git-svn-id: https://vde.svn.sourceforge.net/svnroot/vde/trunk@102 d37a7db1-d92d-0410-89df-f68f52f87b57
---
 vde-2/VERSION                | 2 +-
 vde-2/configure.ac           | 2 +-
 vde-2/doc/Makefile.am        | 9 ++++++++-
 vde-2/libvdeplug/Makefile.am | 1 +
 vde-2/vdetaplib/Makefile.am  | 4 +++-
 vde-2/vdetaplib/libvdetap.c  | 2 +-
 6 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/vde-2/VERSION b/vde-2/VERSION
index 685a9c6..80c13e8 100644
--- a/vde-2/VERSION
+++ b/vde-2/VERSION
@@ -1 +1 @@
-VDE version 2.1.1
+VDE version 2.1.2
diff --git a/vde-2/configure.ac b/vde-2/configure.ac
index fa4f9ab..23e7554 100644
--- a/vde-2/configure.ac
+++ b/vde-2/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(vde, [2.1.1], renzo@cs.unibo.it)
+AC_INIT(vde, [2.1.2], renzo@cs.unibo.it)
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([vde.h])
 AC_CONFIG_HEADER([config.h])
diff --git a/vde-2/doc/Makefile.am b/vde-2/doc/Makefile.am
index 84b3d68..0c95f06 100644
--- a/vde-2/doc/Makefile.am
+++ b/vde-2/doc/Makefile.am
@@ -1,2 +1,9 @@
-man_MANS = dpipe.1 slirpvde.1 vde_plug.1 vdeq.1 vde_switch.1 vdetaplib.1 wirefilter.1 vde_cryptcab.1
+man_MANS = dpipe.1 slirpvde.1 unixterm.1 vde_plug.1 vdeq.1 vde_switch.1 vdetaplib.1 wirefilter.1 vde_cryptcab.1
 EXTRA_DIST = $(man_MANS)
+
+install-data-hook:
+	rm -f $(DESTDIR)$(mandir)/vdeqemu.1
+	(cd $(DESTDIR)$(mandir) && $(LN_S) vdeq.1 vdeqemu.1)
+
+uninstall-local:
+	rm -f $(DESTDIR)$(mandir)/vdeqemu.1
diff --git a/vde-2/libvdeplug/Makefile.am b/vde-2/libvdeplug/Makefile.am
index 1245ad6..9e6f4e1 100644
--- a/vde-2/libvdeplug/Makefile.am
+++ b/vde-2/libvdeplug/Makefile.am
@@ -2,4 +2,5 @@ lib_LTLIBRARIES = libvdeplug.la
 
 libvdeplug_la_SOURCES = libvdeplug.c
 libvdeplug_la_LDFLAGS = -version-number 2:1 -export-dynamic
+
 nobase_include_HEADERS = libvdeplug.h
diff --git a/vde-2/vdetaplib/Makefile.am b/vde-2/vdetaplib/Makefile.am
index 9d41cf6..fdc96d2 100644
--- a/vde-2/vdetaplib/Makefile.am
+++ b/vde-2/vdetaplib/Makefile.am
@@ -1,8 +1,10 @@
 lib_LTLIBRARIES = libvdetap.la
-bin_PROGRAMS = vdetap
+libexec_PROGRAMS = vdetap
 
 libvdetap_la_SOURCES = libvdetap.c
 libvdetap_la_LDFLAGS = -avoid-version -export-dynamic -module -Wl,-init -Wl,libvdetap_init -Wl,-fini -Wl,libvdetap_fini
 
+AM_CPPFLAGS=-DLIBEXECDIR=\"$(libexecdir)\"
+
 vdetap_SOURCES = vdetap.c
 vdetap_LDADD = ../libvdeplug/libvdeplug.la
diff --git a/vde-2/vdetaplib/libvdetap.c b/vde-2/vdetaplib/libvdetap.c
index 1d0892f..98bf7fd 100644
--- a/vde-2/vdetaplib/libvdetap.c
+++ b/vde-2/vdetaplib/libvdetap.c
@@ -20,7 +20,7 @@
 #include <linux/if_tun.h>
 
 #define TUNTAPPATH "/dev/net/tun"
-#define VDETAPEXEC "vdetap"
+#define VDETAPEXEC LIBEXECDIR "/vdetap"
 #define VDEALLTAP "VDEALLTAP"
 #define MAX 10
 
-- 
2.11.4.GIT