blob: 2a59a5ff68715cadf532167eb014e24291147ed3 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
Upstream-Status: Inappropriate [configuration]
diff -ruN procps-3.2.8-orig//Makefile procps-3.2.8/Makefile
--- procps-3.2.8-orig//Makefile 2011-08-23 22:06:46.471163999 +0800
+++ procps-3.2.8/Makefile 2011-08-23 22:15:01.091163999 +0800
@@ -29,9 +29,6 @@
ln_sf := ln -sf
install := install -D --owner 0 --group 0
-# Lame x86-64 /lib64 and /usr/lib64 abomination:
-lib64 := lib$(shell [ -d /lib64 ] && echo 64)
-
usr/bin := $(DESTDIR)/usr/bin/
bin := $(DESTDIR)/bin/
sbin := $(DESTDIR)/sbin/
@@ -39,8 +36,8 @@
man1 := $(DESTDIR)/usr/share/man/man1/
man5 := $(DESTDIR)/usr/share/man/man5/
man8 := $(DESTDIR)/usr/share/man/man8/
-lib := $(DESTDIR)/$(lib64)/
-usr/lib := $(DESTDIR)/usr/$(lib64)/
+lib := $(DESTDIR)/$(base_libdir)/
+usr/lib := $(DESTDIR)/$(libdir)/
usr/include := $(DESTDIR)/usr/include/
#SKIP := $(bin)kill $(man1)kill.1
@@ -222,10 +219,10 @@
###### install
$(BINFILES) : all
- $(install) --mode a=rx $(notdir $@) $@
+ $(install) -m 555 $(notdir $@) $@
$(MANFILES) : all
- $(install) --mode a=r $(notdir $@) $@
+ $(install) -m 444 $(notdir $@) $@
install: $(filter-out $(SKIP) $(addprefix $(DESTDIR),$(SKIP)),$(INSTALL))
cd $(usr/bin) && $(ln_f) skill snice
|
