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.

10 files changed, 3 insertions, 25 deletions

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>