1diff -rc procps-orig/Makefile procps-3.2.4/Makefile
2*** procps-orig/Makefile 2004-10-10 23:31:12.000000000 +0200
3--- procps-3.2.4/Makefile 2005-01-21 19:33:49.700437229 +0100
4***************
5*** 24,47 ****
6 ############ vars
7
8 # so you can disable them or choose alternates
9! ldconfig := ldconfig
10 ln_f := ln -f
11 ln_sf := ln -sf
12! install := install -D --owner 0 --group 0
13
14 # Lame x86-64 /lib64 and /usr/lib64 abomination:
15 lib64 := lib$(shell [ -d /lib64 ] && echo 64)
16
17! usr/bin := $(DESTDIR)/usr/bin/
18 bin := $(DESTDIR)/bin/
19 sbin := $(DESTDIR)/sbin/
20! usr/proc/bin := $(DESTDIR)/usr/bin/
21! man1 := $(DESTDIR)/usr/share/man/man1/
22! man5 := $(DESTDIR)/usr/share/man/man5/
23! man8 := $(DESTDIR)/usr/share/man/man8/
24! lib := $(DESTDIR)/$(lib64)/
25! usr/lib := $(DESTDIR)/usr/$(lib64)/
26! usr/include := $(DESTDIR)/usr/include/
27
28 #SKIP := $(bin)kill $(man1)kill.1
29
30--- 24,47 ----
31 ############ vars
32
33 # so you can disable them or choose alternates
34! ldconfig := true
35 ln_f := ln -f
36 ln_sf := ln -sf
37! install := install -D
38
39 # Lame x86-64 /lib64 and /usr/lib64 abomination:
40 lib64 := lib$(shell [ -d /lib64 ] && echo 64)
41
42! usr/bin := $(DESTDIR)/bin/
43 bin := $(DESTDIR)/bin/
44 sbin := $(DESTDIR)/sbin/
45! usr/proc/bin := $(DESTDIR)/bin/
46! man1 := $(DESTDIR)/share/man/man1/
47! man5 := $(DESTDIR)/share/man/man5/
48! man8 := $(DESTDIR)/share/man/man8/
49! lib := $(DESTDIR)/lib/
50! usr/lib := $(DESTDIR)/lib/
51! usr/include := $(DESTDIR)/include/
52
53 #SKIP := $(bin)kill $(man1)kill.1
54
55***************
56*** 71,77 ****
57
58 # Preprocessor flags.
59 PKG_CPPFLAGS := -D_GNU_SOURCE -I proc
60! CPPFLAGS := -I/usr/include/ncurses
61 ALL_CPPFLAGS := $(PKG_CPPFLAGS) $(CPPFLAGS)
62
63 # Left out -Wconversion due to noise in glibc headers.
64--- 71,77 ----
65
66 # Preprocessor flags.
67 PKG_CPPFLAGS := -D_GNU_SOURCE -I proc
68! CPPFLAGS :=
69 ALL_CPPFLAGS := $(PKG_CPPFLAGS) $(CPPFLAGS)
70
71 # Left out -Wconversion due to noise in glibc headers.