diff options
-rw-r--r-- | Makefile.am | 3 | ||||
-rw-r--r-- | openvpn.spec.in | 16 | ||||
-rw-r--r-- | plugins/README (renamed from plugin/README) | 0 | ||||
-rw-r--r-- | plugins/auth-pam/.svnignore (renamed from plugin/auth-pam/.svnignore) | 0 | ||||
-rwxr-xr-x | plugins/auth-pam/Makefile (renamed from plugin/auth-pam/Makefile) | 0 | ||||
-rw-r--r-- | plugins/auth-pam/README (renamed from plugin/auth-pam/README) | 0 | ||||
-rw-r--r-- | plugins/auth-pam/auth-pam.c (renamed from plugin/auth-pam/auth-pam.c) | 0 | ||||
-rw-r--r-- | plugins/auth-pam/pamdl.c (renamed from plugin/auth-pam/pamdl.c) | 0 | ||||
-rw-r--r-- | plugins/auth-pam/pamdl.h (renamed from plugin/auth-pam/pamdl.h) | 0 | ||||
-rw-r--r-- | plugins/defer/README (renamed from plugin/defer/README) | 0 | ||||
-rwxr-xr-x | plugins/defer/build (renamed from plugin/defer/build) | 0 | ||||
-rw-r--r-- | plugins/defer/simple.c (renamed from plugin/defer/simple.c) | 0 | ||||
-rwxr-xr-x | plugins/defer/simple.def (renamed from plugin/defer/simple.def) | 0 | ||||
-rwxr-xr-x | plugins/defer/winbuild (renamed from plugin/defer/winbuild) | 0 | ||||
-rwxr-xr-x | plugins/down-root/Makefile (renamed from plugin/down-root/Makefile) | 0 | ||||
-rw-r--r-- | plugins/down-root/README (renamed from plugin/down-root/README) | 0 | ||||
-rw-r--r-- | plugins/down-root/down-root.c (renamed from plugin/down-root/down-root.c) | 0 | ||||
-rw-r--r-- | plugins/examples/README (renamed from plugin/examples/README) | 0 | ||||
-rwxr-xr-x | plugins/examples/build (renamed from plugin/examples/build) | 0 | ||||
-rw-r--r-- | plugins/examples/log.c (renamed from plugin/examples/log.c) | 0 | ||||
-rw-r--r-- | plugins/examples/log_v3.c (renamed from plugin/examples/log_v3.c) | 0 | ||||
-rw-r--r-- | plugins/examples/simple.c (renamed from plugin/examples/simple.c) | 0 | ||||
-rwxr-xr-x | plugins/examples/simple.def (renamed from plugin/examples/simple.def) | 0 | ||||
-rwxr-xr-x | plugins/examples/winbuild (renamed from plugin/examples/winbuild) | 0 |
24 files changed, 9 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index 26b80f3..a1c210e 100644 --- a/Makefile.am +++ b/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 = \ diff --git a/openvpn.spec.in b/openvpn.spec.in index c42e7c6..9a45c79 100644 --- a/openvpn.spec.in +++ b/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> 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 e69fe3f..e69fe3f 100755 --- a/plugin/auth-pam/Makefile +++ b/plugins/auth-pam/Makefile diff --git a/plugin/auth-pam/README b/plugins/auth-pam/README index e123690..e123690 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 e52f632..e52f632 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 8636a8e..8636a8e 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/defer/README b/plugins/defer/README index d8990f8..d8990f8 100644 --- a/plugin/defer/README +++ b/plugins/defer/README diff --git a/plugin/defer/build b/plugins/defer/build index 5907afa..5907afa 100755 --- a/plugin/defer/build +++ b/plugins/defer/build diff --git a/plugin/defer/simple.c b/plugins/defer/simple.c index 6539865..6539865 100644 --- a/plugin/defer/simple.c +++ b/plugins/defer/simple.c diff --git a/plugin/defer/simple.def b/plugins/defer/simple.def index a87507d..a87507d 100755 --- a/plugin/defer/simple.def +++ b/plugins/defer/simple.def diff --git a/plugin/defer/winbuild b/plugins/defer/winbuild index 97e724a..97e724a 100755 --- a/plugin/defer/winbuild +++ b/plugins/defer/winbuild 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 fced23b..fced23b 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 5907afa..5907afa 100755 --- a/plugin/examples/build +++ b/plugins/examples/build diff --git a/plugin/examples/log.c b/plugins/examples/log.c index 1cc4650..1cc4650 100644 --- a/plugin/examples/log.c +++ b/plugins/examples/log.c diff --git a/plugin/examples/log_v3.c b/plugins/examples/log_v3.c index 187c592..187c592 100644 --- a/plugin/examples/log_v3.c +++ b/plugins/examples/log_v3.c diff --git a/plugin/examples/simple.c b/plugins/examples/simple.c index f26d89f..f26d89f 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 |