aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNalin Dahyabhai <nalin@redhat.com>2000-10-10 16:03:15 +0000
committerNalin Dahyabhai <nalin@redhat.com>2000-10-10 16:03:15 +0000
commit5d49535ed95db82dd418f984dad94f9befa330a3 (patch)
treeb1e78759658535460d1c778f529decd2471ab82a
parent55e1442f04cc36d0a514d4b13c9667b1b44effa6 (diff)
downloadinitscripts-5d49535ed95db82dd418f984dad94f9befa330a3.tar
initscripts-5d49535ed95db82dd418f984dad94f9befa330a3.tar.gz
initscripts-5d49535ed95db82dd418f984dad94f9befa330a3.tar.bz2
initscripts-5d49535ed95db82dd418f984dad94f9befa330a3.tar.xz
initscripts-5d49535ed95db82dd418f984dad94f9befa330a3.zip
fix top-level makefile install target
-rw-r--r--Makefile4
-rw-r--r--initscripts.spec3
2 files changed, 5 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 84edd235..836bb25d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,6 @@
ROOT=/
+SUPERUSER=root
+SUPERGROUP=root
VERSION=$(shell awk '/Version:/ { print $$2 }' initscripts.spec)
CVSTAG = r$(subst .,-,$(VERSION))
@@ -38,7 +40,7 @@ install:
ln -sf ../../../sbin/ifdown . )
(cd src; make install ROOT=$(ROOT) mandir=$(mandir))
mkdir -p $(ROOT)/var/run/netreport
- chown root.root $(ROOT)/var/run/netreport
+ chown $(SUPERUSER).$(SUPERGROUP) $(ROOT)/var/run/netreport
chmod og=rwx,o=rx $(ROOT)/var/run/netreport
check:
diff --git a/initscripts.spec b/initscripts.spec
index 050b1ff9..0de5cf78 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -32,7 +32,7 @@ make
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/etc
-make ROOT=$RPM_BUILD_ROOT mandir=%{_mandir} install
+make ROOT=$RPM_BUILD_ROOT SUPERUSER=`id -un` SUPERGROUP=`id -gn` mandir=%{_mandir} install
mkdir -p $RPM_BUILD_ROOT/var/run/netreport
#chown root.root $RPM_BUILD_ROOT/var/run/netreport
chmod u=rwx,g=rwx,o=rx $RPM_BUILD_ROOT/var/run/netreport
@@ -231,6 +231,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Tue Oct 10 2000 Nalin Dahyabhai <nalin@redhat.com>
- handle "gw x.x.x.x" as the last pair of flags in ifup-routes (#18804)
+- fix top-level makefile install target
* Sun Sep 3 2000 Florian La Roche <Florian.LaRoche@redhat.com>
- /etc/init.d is already provided by chkconfig