From 7c5e2a7272bf9868ae53fad6aabdd62b88fd9ddf Mon Sep 17 00:00:00 2001
From: matt mooney <mfm@muteddisk.com>
Date: Sat, 14 May 2011 03:55:08 -0700
Subject: [PATCH] --- yaml --- r: 249707 b: refs/heads/master c:
 7f27b199119980cba63c7968091d090beb6960cf h: refs/heads/master i:   249705:
 5596055dfb9fe15614cbfb8fbf72731b99d4a5ab   249703:
 a0a92d217f645898b32429b4e1d7e9eaef2205bd v: v3

---
 [refs]                                                          | 2 +-
 trunk/drivers/staging/usbip/userspace/Makefile.am               | 2 ++
 trunk/drivers/staging/usbip/userspace/cmd/Makefile.am           | 2 --
 trunk/drivers/staging/usbip/userspace/{cmd => doc}/usbip.8      | 0
 .../staging/usbip/userspace/{cmd => doc}/usbip_bind_driver.8    | 0
 trunk/drivers/staging/usbip/userspace/{cmd => doc}/usbipd.8     | 0
 6 files changed, 3 insertions(+), 3 deletions(-)
 rename trunk/drivers/staging/usbip/userspace/{cmd => doc}/usbip.8 (100%)
 rename trunk/drivers/staging/usbip/userspace/{cmd => doc}/usbip_bind_driver.8 (100%)
 rename trunk/drivers/staging/usbip/userspace/{cmd => doc}/usbipd.8 (100%)

diff --git a/[refs] b/[refs]
index 7fceca888ccb..731e7daf0097 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0945b4fe3f016900f1f68255e24920b28624a9aa
+refs/heads/master: 7f27b199119980cba63c7968091d090beb6960cf
diff --git a/trunk/drivers/staging/usbip/userspace/Makefile.am b/trunk/drivers/staging/usbip/userspace/Makefile.am
index 964f005a4205..c0769526828b 100644
--- a/trunk/drivers/staging/usbip/userspace/Makefile.am
+++ b/trunk/drivers/staging/usbip/userspace/Makefile.am
@@ -2,6 +2,8 @@ SUBDIRS = lib cmd
 includedir=@includedir@/usbip
 include_HEADERS = lib/usbip.h lib/usbip_common.h lib/vhci_driver.h lib/stub_driver.h
 
+dist_man_MANS := $(addprefix doc/, usbip.8 usbipd.8 usbip_bind_driver.8)
+
 if INSTALL_USBIDS
 pkgdata_DATA = usb.ids
 EXTRA_DIST = $(pkgdata_DATA)
diff --git a/trunk/drivers/staging/usbip/userspace/cmd/Makefile.am b/trunk/drivers/staging/usbip/userspace/cmd/Makefile.am
index c923e49a7631..5cc50fc71de2 100644
--- a/trunk/drivers/staging/usbip/userspace/cmd/Makefile.am
+++ b/trunk/drivers/staging/usbip/userspace/cmd/Makefile.am
@@ -8,8 +8,6 @@ usbip_bind_driver_SOURCES = bind-driver.c \
 		utils.c utils.h \
 		usbip_network.h usbip_network.c
 
-dist_man_MANS = usbip.8 usbipd.8 usbip_bind_driver.8
-
 #usbip_bind_driver_CFLAGS = -Wall -W -Wstrict-prototypes @PACKAGE_CFLAGS@
 #usbip_bind_driver_LDADD = @PACKAGE_LIBS@
 
diff --git a/trunk/drivers/staging/usbip/userspace/cmd/usbip.8 b/trunk/drivers/staging/usbip/userspace/doc/usbip.8
similarity index 100%
rename from trunk/drivers/staging/usbip/userspace/cmd/usbip.8
rename to trunk/drivers/staging/usbip/userspace/doc/usbip.8
diff --git a/trunk/drivers/staging/usbip/userspace/cmd/usbip_bind_driver.8 b/trunk/drivers/staging/usbip/userspace/doc/usbip_bind_driver.8
similarity index 100%
rename from trunk/drivers/staging/usbip/userspace/cmd/usbip_bind_driver.8
rename to trunk/drivers/staging/usbip/userspace/doc/usbip_bind_driver.8
diff --git a/trunk/drivers/staging/usbip/userspace/cmd/usbipd.8 b/trunk/drivers/staging/usbip/userspace/doc/usbipd.8
similarity index 100%
rename from trunk/drivers/staging/usbip/userspace/cmd/usbipd.8
rename to trunk/drivers/staging/usbip/userspace/doc/usbipd.8