procps: fix installation stuff.

--HG--
extra : convert_revision : f5c0ae5791c0bc2528e5e2d3b6457d8b8ae92341
This commit is contained in:
Juan RP 2010-04-22 13:27:48 +02:00
parent baa0c0bec0
commit 7a4878c414

View file

@ -1,7 +1,18 @@
Do not install kill and uptime, use /lib for all archs. --- Makefile.orig 2009-05-10 20:50:48.000000000 +0200
+++ Makefile 2010-04-22 13:18:13.010792002 +0200
@@ -24,10 +24,10 @@ TARVERSION := $(VERSION).$(SUBVERSION)
############ vars
--- Makefile.orig 2006-06-24 11:02:25.000000000 +0200 # so you can disable them or choose alternates
+++ Makefile 2008-10-24 08:40:57.000000000 +0200 -ldconfig := ldconfig
+ldconfig :=
ln_f := ln -f
ln_sf := ln -sf
-install := install -D --owner 0 --group 0
+install := install -D
# Lame x86-64 /lib64 and /usr/lib64 abomination:
lib64 := lib$(shell [ -d /lib64 ] && echo 64)
@@ -39,20 +39,20 @@ usr/proc/bin := $(DESTDIR)/u @@ -39,20 +39,20 @@ usr/proc/bin := $(DESTDIR)/u
man1 := $(DESTDIR)/usr/share/man/man1/ man1 := $(DESTDIR)/usr/share/man/man1/
man5 := $(DESTDIR)/usr/share/man/man5/ man5 := $(DESTDIR)/usr/share/man/man5/
@ -29,3 +40,58 @@ Do not install kill and uptime, use /lib for all archs.
$(man1)snice.1 $(man1)pgrep.1 $(man1)pkill.1 $(man1)pmap.1 \ $(man1)snice.1 $(man1)pgrep.1 $(man1)pkill.1 $(man1)pmap.1 \
$(man5)sysctl.conf.5 $(man8)vmstat.8 $(man8)sysctl.8 \ $(man5)sysctl.conf.5 $(man8)vmstat.8 $(man8)sysctl.8 \
$(man1)slabtop.1 $(man1)pwdx.1 $(man1)slabtop.1 $(man1)pwdx.1
@@ -222,10 +222,10 @@ clean:
###### install
$(BINFILES) : all
- $(install) --mode a=rx $(notdir $@) $@
+ $(install) -m755 $(notdir $@) $@
$(MANFILES) : all
- $(install) --mode a=r $(notdir $@) $@
+ $(install) -m644 $(notdir $@) $@
install: $(filter-out $(SKIP) $(addprefix $(DESTDIR),$(SKIP)),$(INSTALL))
cd $(usr/bin) && $(ln_f) skill snice
--- proc/module.mk.orig 2010-04-22 13:22:25.736775611 +0200
+++ proc/module.mk 2010-04-22 13:24:09.814780650 +0200
@@ -42,7 +42,7 @@ FPIC := -fpic
ifeq ($(SHARED),1)
ALL += proc/$(SONAME)
-INSTALL += ldconfig
+INSTALL += ldconfig
LIBFLAGS := -DSHARED=1 $(FPIC)
# This is in gcc 3.5, but exported functions must be marked.
#LIBFLAGS += $(call check_gcc,-fvisibility=hidden,)
@@ -96,7 +96,7 @@ endif
#################### install rules ###########################
$(lib)$(SOFILE) : proc/$(SONAME)
- $(install) --mode a=rx $< $@
+ $(install) -m755 $< $@
ifneq ($(SOLINK),$(SOFILE))
.PHONY: $(lib)$(SOLINK)
@@ -115,7 +115,7 @@ ldconfig : $(lib)$(SONAME) $(lib)$(SOLIN
$(ldconfig)
$(usr/lib)$(ANAME) : proc/$(ANAME)
- $(install) --mode a=r $< $@
+ $(install) -m644 $< $@
# Junk anyway... supposed to go in /usr/include/$(NAME)
#INSTALL += $(addprefix $(include),$(HDRFILES))
--- ps/module.mk.orig 2010-04-22 13:26:49.156775917 +0200
+++ ps/module.mk 2010-04-22 13:27:05.019792210 +0200
@@ -33,8 +33,8 @@ ps/stacktrace.o: ps/stacktrace.c
$(bin)ps: ps/ps
- $(install) --mode a=rx $< $@
+ $(install) -m755 $< $@
$(man1)ps.1 : ps/ps.1
- $(install) --mode a=r $< $@
+ $(install) -m644 $< $@
-rm -f $(DESTDIR)/var/catman/cat1/ps.1.gz $(DESTDIR)/var/man/cat1/ps.1.gz