Don't hard-code the user and group when doing an install: instead use

whatever the current user/group is. If you wish to override, edit the
makefile or override the INSTALL_CMD_* variables on the command line.

12 files changed, 10 insertions, 48 deletions

diff --git a/configure.pl b/configure.pl
index 45a9f08cc..3a2a7e83c 100755
--- a/configure.pl
+++ b/configure.pl
@@ -1378,8 +1378,7 @@ sub get_os_info {
         match_any_of($_, \%info, 'unquoted',
                    'os_type:obj_suffix:so_suffix:static_suffix:' .
                    'install_root:header_dir:lib_dir:doc_dir:' .
-                   'install_user:install_group:ar_needs_ranlib:' .
-                   'install_cmd_data:install_cmd_exec');
+                   'ar_needs_ranlib:install_cmd_data:install_cmd_exec');
 
         read_list($_, $reader, 'aliases', list_push(\@{$info{'aliases'}}));
 
@@ -1641,8 +1640,6 @@ sub generate_makefile {
 
        'install_cmd_exec' => os_info_for($os, 'install_cmd_exec'),
        'install_cmd_data' => os_info_for($os, 'install_cmd_data'),
-       'install_user' => os_info_for($os, 'install_user'),
-       'install_group' => os_info_for($os, 'install_group'),
        });
 
    my $is_in_doc_dir =
@@ -1693,9 +1690,6 @@ sub generate_makefile {
        $template = File::Spec->catfile($template_dir, 'unix_shr.in')
            if($$config{'shared'} eq 'yes');
 
-       $$config{'install_cmd_exec'} =~ s/(OWNER|GROUP)/\$($1)/g;
-       $$config{'install_cmd_data'} =~ s/(OWNER|GROUP)/\$($1)/g;
-
        add_to($config, {
            'link_to' => libs('-l', '', 'm', @{$$config{'mod_libs'}}),
        });
diff --git a/doc/building.tex b/doc/building.tex
index c5794019c..2cb1d0723 100644
--- a/doc/building.tex
+++ b/doc/building.tex
@@ -138,22 +138,12 @@ this by using the \texttt{--prefix} argument to
 
 \verb|./configure.pl --prefix=/opt <other arguments>|
 
-On Unix, the makefile has to decide who should own the files once they are
-installed. By default, it uses \texttt{root:root}, but on some systems (for
-example, MacOS X), there is no \texttt{root} group. Also, if you don't have
-root access on the system you will want them to be installed owned by something
-other than root (like yourself). You can override the defaults at install time
-by setting the \texttt{OWNER} and \texttt{GROUP} variables from the command
-line.
-
-\verb|make OWNER=lloyd GROUP=users install|
-
-On some systems shared libraries might not be immediately visible to the
-runtime linker. For example, on Linux you may have to edit
-\filename{/etc/ld.so.conf} and run \texttt{ldconfig} (as root) in order for new
-shared libraries to be picked up by the linker. An alternative is to set your
-\texttt{LD\_LIBRARY\_PATH} shell variable to include the directory that the
-Botan libraries were installed into.
+On some systems shared libraries might not be immediately visible to
+the runtime linker. For example, on Linux you may have to edit
+\filename{/etc/ld.so.conf} and run \texttt{ldconfig} (as root) in
+order for new shared libraries to be picked up by the linker. An
+alternative is to set your \texttt{LD\_LIBRARY\_PATH} shell variable
+to include the directory that the Botan libraries were installed into.
 
 \subsection{MS Windows}
 
diff --git a/misc/Botan.spec b/misc/Botan.spec
index e2d38ecb9..c0b082e60 100644
--- a/misc/Botan.spec
+++ b/misc/Botan.spec
@@ -99,7 +99,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %install
 ROOT="$RPM_BUILD_ROOT/usr"
-make OWNER=`id -u` GROUP=`id -g` INSTALLROOT="$ROOT" install
+make INSTALLROOT="$ROOT" install
 
 # Need this since we're installing shared libs...
 %post
diff --git a/misc/config/makefile/unix.in b/misc/config/makefile/unix.in
index 76ca08a66..3422f50cf 100644
--- a/misc/config/makefile/unix.in
+++ b/misc/config/makefile/unix.in
@@ -28,9 +28,6 @@ LIBDIR        = $(INSTALLROOT)/@{var:libdir}
 HEADERDIR     = $(INSTALLROOT)/@{var:includedir}/botan
 DOCDIR        = $(INSTALLROOT)/@{var:docdir}/Botan-$(VERSION)
 
-OWNER         = @{var:install_user}
-GROUP         = @{var:install_group}
-
 CONFIG_SCRIPT = @{var:botan-config}
 
 ##################################################
diff --git a/misc/config/makefile/unix_shr.in b/misc/config/makefile/unix_shr.in
index 9d9b70a99..558ece61e 100644
--- a/misc/config/makefile/unix_shr.in
+++ b/misc/config/makefile/unix_shr.in
@@ -30,9 +30,6 @@ LIBDIR        = $(INSTALLROOT)/@{var:libdir}
 HEADERDIR     = $(INSTALLROOT)/@{var:includedir}/botan
 DOCDIR        = $(INSTALLROOT)/@{var:docdir}/Botan-$(VERSION)
 
-OWNER         = @{var:install_user}
-GROUP         = @{var:install_group}
-
 CONFIG_SCRIPT = @{var:botan-config}
 
 ##################################################
diff --git a/misc/config/os/darwin b/misc/config/os/darwin
index 248dc3d97..aa28dc59b 100644
--- a/misc/config/os/darwin
+++ b/misc/config/os/darwin
@@ -8,8 +8,6 @@ so_suffix dylib
 ar_command "ar cr"
 ar_needs_ranlib yes
 
-install_group wheel
-
 doc_dir doc
 
 <supports_shared>
diff --git a/misc/config/os/defaults b/misc/config/os/defaults
index a22821e56..88fd82252 100644
--- a/misc/config/os/defaults
+++ b/misc/config/os/defaults
@@ -15,7 +15,5 @@ header_dir include
 lib_dir lib
 doc_dir share/doc
 
-install_user root
-install_group root
-install_cmd_data install -o OWNER -g GROUP -m 644
-install_cmd_exec install -o OWNER -g GROUP -m 755
+install_cmd_data install -m 644
+install_cmd_exec install -m 755
diff --git a/misc/config/os/freebsd b/misc/config/os/freebsd
index 6cc184d98..e58ade517 100644
--- a/misc/config/os/freebsd
+++ b/misc/config/os/freebsd
@@ -2,8 +2,6 @@ realname "FreeBSD"
 
 os_type unix
 
-install_group wheel
-
 <supports_shared>
 all
 </supports_shared>
diff --git a/misc/config/os/netbsd b/misc/config/os/netbsd
index da713e3a0..435d8f5e8 100644
--- a/misc/config/os/netbsd
+++ b/misc/config/os/netbsd
@@ -2,8 +2,6 @@ realname "NetBSD"
 
 os_type unix
 
-install_group wheel
-
 <supports_shared>
 all
 </supports_shared>
diff --git a/misc/config/os/openbsd b/misc/config/os/openbsd
index 9f966bf49..cb44bd115 100644
--- a/misc/config/os/openbsd
+++ b/misc/config/os/openbsd
@@ -2,8 +2,6 @@ realname "OpenBSD"
 
 os_type unix
 
-install_group wheel
-
 <supports_shared>
 all
 </supports_shared>
diff --git a/misc/config/os/solaris b/misc/config/os/solaris
index 58b458e9b..a1c1b40b3 100644
--- a/misc/config/os/solaris
+++ b/misc/config/os/solaris
@@ -2,9 +2,6 @@ realname "Solaris"
 
 os_type unix
 
-install_cmd_data install -u OWNER -g GROUP -m 644
-install_cmd_exec install -u OWNER -g GROUP -m 755
-
 <supports_shared>
 all
 </supports_shared>
diff --git a/misc/config/os/windows b/misc/config/os/windows
index 2f21da309..6adff5154 100644
--- a/misc/config/os/windows
+++ b/misc/config/os/windows
@@ -12,9 +12,6 @@ doc_dir docs
 install_cmd_data copy
 install_cmd_exec copy
 
-install_user <nil>
-install_group <nil>
-
 <supports_shared>
 #all
 </supports_shared>