build: rename plugin directory to plugins

This to avoid conflit with plugin.c rules

Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>

Makefile.am

@@ -24,7 +24,6 @@
 #
 
 LDADD = @LIBOBJS@
-.PHONY: plugin
 
 # This option prevents autoreconf from overriding our COPYING and
 # INSTALL targets:
@@ -49,7 +48,7 @@ EXTRA_DIST = \
 	tap-win32 \
 	contrib \
 	debug \
-	plugin \
+	plugins \
 	win
 
 SUBDIRS = \

openvpn.spec.in

@@ -103,13 +103,13 @@ and portability to most major OS platforms.
 %__make
 
 # 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
@@ -153,16 +153,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
@@ -222,7 +222,7 @@ fi
 %endif
 
 # Install extra %doc stuff
-%doc contrib/ easy-rsa/ sample-*/ plugin/README.*
+%doc contrib/ easy-rsa/ sample-*/ plugins/README.*
 
 %changelog
 * Thu Jul 30 2009 David Sommerseth <dazo@users.sourceforge.net>