19 files changed, 36 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index a960cfc..a7da555 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,15 @@ Copyright (C) 2002-2005 OpenVPN Solutions LLC <info@openvpn.net>
 
 $Id$
 
+2005.10.xx -- Version 2.1-beta3
+
+* NOTE TO PACKAGE MAINTAINERS: Moved "plugin"
+  directory to "plugins".  This is
+  to work around a strange problem with the
+  "make dist" target in the automake-generated
+  makefile, where the target tries to do a
+  rather bogus "gcc -g -O2 -I. plugin.c -o plugin".
+
 2005.10.13 -- Version 2.1-beta2
 
 * Added --socket-flags directive with TCP_NODELAY
diff --git a/INSTALL b/INSTALL
index 0842305..55b2f61 100644
--- a/INSTALL
+++ b/INSTALL
@@ -60,6 +60,18 @@ OPTIONAL (for developers only):
 
 *************************************************************************
 
+CHECK OUT SOURCE FROM SUBVERSION REPOSITORY:
+
+  Check out stable version:
+
+    svn checkout http://svn.openvpn.net/projects/openvpn/trunk/openvpn openvpn
+
+  Check out beta21 branch:
+
+    svn checkout http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn openvpn
+
+*************************************************************************
+
 BUILD COMMANDS FROM TARBALL:
 
 	./configure
@@ -68,7 +80,7 @@ BUILD COMMANDS FROM TARBALL:
 
 *************************************************************************
 
-BUILD COMMANDS FROM CVS:
+BUILD COMMANDS FROM SUBVERSION REPOSITORY CHECKOUT:
 
 	autoreconf -i -v
 	./configure
@@ -77,7 +89,7 @@ BUILD COMMANDS FROM CVS:
 
 *************************************************************************
 
-BUILD A TARBALL FROM CVS:
+BUILD A TARBALL FROM SUBVERSION REPOSITORY CHECKOUT:
 
 	autoreconf -i -v
 	./configure
diff --git a/Makefile.am b/Makefile.am
index dd0e5b9..d84952b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -121,7 +121,7 @@ EXTRA_DIST = \
 	service-win32 \
 	contrib \
 	debug \
-	plugin \
+	plugins \
         management
 
 dist-hook:
diff --git a/openvpn.spec.in b/openvpn.spec.in
index 041ffdd..01c9bfd 100644
--- a/openvpn.spec.in
+++ b/openvpn.spec.in
@@ -101,13 +101,13 @@ and portability to most major OS platforms.
 %__strip %{name}
 
 # Build down-root plugin
-pushd plugin/down-root
+pushd plugins/down-root
 %__make
 popd
 
 # Build auth-pam plugin
 %if %{build_auth_pam}
-pushd plugin/auth-pam
+pushd plugins/auth-pam
 %__make
 popd
 %endif
@@ -151,16 +151,16 @@ popd
 # Install the plugins
 #
 
-%__mkdir_p %{buildroot}%{_datadir}/%{name}/plugin/lib
+%__mkdir_p %{buildroot}%{_datadir}/%{name}/plugins/lib
 
 for pi in auth-pam down-root; do
-  %__mv -f plugin/$pi/README plugin/README.$pi
-  if [ -e plugin/$pi/openvpn-$pi.so ]; then
-    %__install -c -m 755 plugin/$pi/openvpn-$pi.so %{buildroot}%{_datadir}/openvpn/plugin/lib/openvpn-$pi.so
+  %__mv -f plugins/$pi/README plugins/README.$pi
+  if [ -e plugins/$pi/openvpn-$pi.so ]; then
+    %__install -c -m 755 plugins/$pi/openvpn-$pi.so %{buildroot}%{_datadir}/openvpn/plugins/lib/openvpn-$pi.so
   fi
 done
 
-%__mv -f plugin/README plugin/README.plugins
+%__mv -f plugins/README plugins/README.plugins
 
 #
 # Clean section
@@ -220,10 +220,14 @@ fi
 %endif
 
 # Install extra %doc stuff
-%doc contrib/ easy-rsa/ management/ sample-*/ plugin/README.*
+%doc contrib/ easy-rsa/ management/ sample-*/ plugins/README.*
 
 %changelog
 
+* Mon Oct 13 2005 James Yonan
+- Renamed plugin directory to plugins to
+  work around automake issue.
+
 * Mon Aug 2 2005 James Yonan
 - Fixed build problem with --define 'without_pam 1'
 
diff --git a/plugin/README b/plugins/README
index 6e490c5..6e490c5 100644
--- a/plugin/README
+++ b/plugins/README
diff --git a/plugin/auth-pam/.svnignore b/plugins/auth-pam/.svnignore
index 140f8cf..140f8cf 100644
--- a/plugin/auth-pam/.svnignore
+++ b/plugins/auth-pam/.svnignore
diff --git a/plugin/auth-pam/Makefile b/plugins/auth-pam/Makefile
index 3e7c6ce..3e7c6ce 100755
--- a/plugin/auth-pam/Makefile
+++ b/plugins/auth-pam/Makefile
diff --git a/plugin/auth-pam/README b/plugins/auth-pam/README
index c957c02..c957c02 100644
--- a/plugin/auth-pam/README
+++ b/plugins/auth-pam/README
diff --git a/plugin/auth-pam/auth-pam.c b/plugins/auth-pam/auth-pam.c
index a2b2934..a2b2934 100644
--- a/plugin/auth-pam/auth-pam.c
+++ b/plugins/auth-pam/auth-pam.c
diff --git a/plugin/auth-pam/pamdl.c b/plugins/auth-pam/pamdl.c
index aaac240..aaac240 100644
--- a/plugin/auth-pam/pamdl.c
+++ b/plugins/auth-pam/pamdl.c
diff --git a/plugin/auth-pam/pamdl.h b/plugins/auth-pam/pamdl.h
index b10b035..b10b035 100644
--- a/plugin/auth-pam/pamdl.h
+++ b/plugins/auth-pam/pamdl.h
diff --git a/plugin/down-root/Makefile b/plugins/down-root/Makefile
index 5ce4ffb..5ce4ffb 100755
--- a/plugin/down-root/Makefile
+++ b/plugins/down-root/Makefile
diff --git a/plugin/down-root/README b/plugins/down-root/README
index d337ffe..d337ffe 100644
--- a/plugin/down-root/README
+++ b/plugins/down-root/README
diff --git a/plugin/down-root/down-root.c b/plugins/down-root/down-root.c
index f19d857..f19d857 100644
--- a/plugin/down-root/down-root.c
+++ b/plugins/down-root/down-root.c
diff --git a/plugin/examples/README b/plugins/examples/README
index 4400cd3..4400cd3 100644
--- a/plugin/examples/README
+++ b/plugins/examples/README
diff --git a/plugin/examples/build b/plugins/examples/build
index 8b628a2..8b628a2 100755
--- a/plugin/examples/build
+++ b/plugins/examples/build
diff --git a/plugin/examples/simple.c b/plugins/examples/simple.c
index aa823b7..aa823b7 100644
--- a/plugin/examples/simple.c
+++ b/plugins/examples/simple.c
diff --git a/plugin/examples/simple.def b/plugins/examples/simple.def
index a87507d..a87507d 100755
--- a/plugin/examples/simple.def
+++ b/plugins/examples/simple.def
diff --git a/plugin/examples/winbuild b/plugins/examples/winbuild
index 97e724a..97e724a 100755
--- a/plugin/examples/winbuild
+++ b/plugins/examples/winbuild