1 diff -Nur procps-2.0.7.orig/Makefile procps-2.0.7/Makefile
2 --- procps-2.0.7.orig/Makefile Thu Jul 13 22:22:58 2000
3 +++ procps-2.0.7/Makefile Mon Aug 26 22:25:26 2002
7 export MANDIR = /usr/share/man
8 -export MAN1DIR = $(DESTDIR)$(MANDIR)/man1
9 -export MAN5DIR = $(DESTDIR)$(MANDIR)/man5
10 -export MAN8DIR = $(DESTDIR)$(MANDIR)/man8
11 -export BINDIR = $(DESTDIR)/bin
12 -export SBINDIR = $(DESTDIR)/sbin
13 -export XBINDIR = $(DESTDIR)/usr/X11R6/bin
14 -export USRBINDIR = $(DESTDIR)/usr/bin
15 -export PROCDIR = $(DESTDIR)/usr/bin# /usr/proc/bin for Solaris devotees
16 -export APPLNK = $(DESTDIR)/etc/X11/applnk/Utilities
17 -export OWNERGROUP = --owner 0 --group 0
18 -export INSTALLBIN = install --mode a=rx --strip
19 +export MAN1DIR = $(MANDIR)/man1
20 +export MAN5DIR = $(MANDIR)/man5
21 +export MAN8DIR = $(MANDIR)/man8
23 +export SBINDIR = /sbin
24 +export XBINDIR = /usr/X11R6/bin
25 +export USRBINDIR = /usr/bin
26 +export PROCDIR = /usr/bin# /usr/proc/bin for Solaris devotees
27 +export APPLNK = /etc/X11/applnk/Utilities
29 +export INSTALLBIN = install --mode a=rx
30 export INSTALLSCT = install --mode a=rx
31 export INSTALLMAN = install --mode a=r
35 export CFLAGS = -D_GNU_SOURCE $(OPT) $(GCC_WARN) -I$(shell pwd) $(INCDIRS)
36 export SHARED = 1# build/install both a static and ELF shared library
37 -export SHLIBDIR = $(DESTDIR)/lib# where to install the shared library
38 +export SHLIBDIR = /lib# where to install the shared library
39 export LDFLAGS = -Wl,-warn-common #-s recommended for ELF systems
40 #LDFLAGS = -qmagic -s# recommended for a.out systems
41 #LDFLAGS = -Xlinker -qmagic -s# older a.out systems may need this
43 # INSTALL PROGRAMS + DOCS
44 install: $(patsubst %,install_%,$(BUILD) $(XSCPT) $(MAN1) $(MAN5) $(MAN8))
46 - install $(OWNERGROUP) --mode a=rx $(LIB_TGT) $(SHLIBDIR)
47 + install -d $(DESTDIR)$(SHLIBDIR)
48 + install $(OWNERGROUP) --mode a=rx $(LIB_TGT) $(DESTDIR)$(SHLIBDIR)
51 # INSTALL LIBRARIES + HEADERS (OPTIONAL)
53 # static pattern installation rules
55 $(patsubst %,install_%,$(BPROG)): install_%: %
56 - $(INSTALLBIN) $< $(BINDIR)/$(PREFIX)$<
57 + $(INSTALLBIN) $< $(DESTDIR)$(BINDIR)/$(PREFIX)$<
58 $(patsubst %,install_%,$(SPROG)): install_%: %
59 - $(INSTALLBIN) $< $(SBINDIR)/$(PREFIX)$<
60 + $(INSTALLBIN) $< $(DESTDIR)$(SBINDIR)/$(PREFIX)$<
61 $(patsubst %,install_%,$(UPROG)): install_%: %
62 - $(INSTALLBIN) $< $(USRBINDIR)/$(PREFIX)$<
63 + $(INSTALLBIN) $< $(DESTDIR)$(USRBINDIR)/$(PREFIX)$<
64 $(patsubst %,install_%,$(PPROG)): install_%: %
65 - $(INSTALLBIN) $< $(PROCDIR)/$(PREFIX)$<
66 + $(INSTALLBIN) $< $(DESTDIR)$(PROCDIR)/$(PREFIX)$<
67 $(patsubst %,install_%,$(XSCPT)): install_%: %
68 - $(INSTALLSCT) $< $(XBINDIR)/$(PREFIX)$<
69 + $(INSTALLSCT) $< $(DESTDIR)$(XBINDIR)/$(PREFIX)$<
70 $(patsubst %,install_%,$(MAN1)) : install_%: %
71 - $(INSTALLMAN) $< $(MAN1DIR)/$(PREFIX)$<
72 + $(INSTALLMAN) $< $(DESTDIR)$(MAN1DIR)/$(PREFIX)$<
73 $(patsubst %,install_%,$(MAN5)) : install_%: %
74 - $(INSTALLMAN) $< $(MAN5DIR)/$(PREFIX)$<
75 + $(INSTALLMAN) $< $(DESTDIR)$(MAN5DIR)/$(PREFIX)$<
76 $(patsubst %,install_%,$(MAN8)) : install_%: %
77 - $(INSTALLMAN) $< $(MAN8DIR)/$(PREFIX)$<
78 + $(INSTALLMAN) $< $(DESTDIR)$(MAN8DIR)/$(PREFIX)$<
79 $(patsubst %,install_%,$(DESKTOP)) : install_%: %
80 - $(INSTALLSCT) $< $(APPLNK)/$(PREFIX)$<
81 + $(INSTALLSCT) $< $(DESTDIR)$(APPLNK)/$(PREFIX)$<
83 # special case install rules
84 install_snice: snice install_skill
85 - cd $(USRBINDIR) && ln -f skill snice
86 + cd $(DESTDIR)$(USRBINDIR) && ln -f skill snice
87 install_kill: snice install_skill
88 - cd $(USRBINDIR) && ln -f skill kill
89 + cd $(DESTDIR)$(USRBINDIR) && ln -f skill kill
90 install_pkill: pgrep install_pgrep
91 - cd $(USRBINDIR) && ln -f pgrep pkill
92 + cd $(DESTDIR)$(USRBINDIR) && ln -f pgrep pkill
94 # Find all the source and object files in this directory
96 diff -Nur procps-2.0.7.orig/proc/Makefile procps-2.0.7/proc/Makefile
97 --- procps-2.0.7.orig/proc/Makefile Mon Aug 26 21:47:44 2002
98 +++ procps-2.0.7/proc/Makefile Mon Aug 26 22:25:18 2002
103 - if ! [ -d $(HDRDIR) ] ; then mkdir $(HDRDIR) ; fi
104 - $(INSTALL) $(HDROWN) $(HDR) $(TOPDIR)/include/$(NAME)
105 - $(INSTALL) $(LIBOWN) lib$(NAME).a $(LIBDIR)
106 + if ! [ -d $(DESTDIR)$(HDRDIR) ] ; then install -d $(DESTDIR)$(HDRDIR) ; fi
107 + $(INSTALL) $(HDROWN) $(HDR) $(DESTDIR)$(TOPDIR)/include/$(NAME)
108 + install -d $(DESTDIR)$(LIBDIR)
109 + $(INSTALL) $(LIBOWN) lib$(NAME).a $(DESTDIR)$(LIBDIR)
111 - $(INSTALL) $(LIBOWN) $(SONAME) $(SHLIBDIR)
112 - ln -sf $(SHLIBDIR)/$(SONAME) $(SHLIBDIR)/lib$(NAME).so
114 + install -d $(DESTDIR)$(SHLIBDIR)
115 + $(INSTALL) $(LIBOWN) $(SONAME) $(DESTDIR)$(SHLIBDIR)
116 + ln -sf $(SHLIBDIR)/$(SONAME) $(DESTDIR)$(LIBDIR)/lib$(NAME).so
119 # VARIOUS SHORT CUT TARGETS
120 diff -Nur procps-2.0.7.orig/ps/Makefile procps-2.0.7/ps/Makefile
121 --- procps-2.0.7.orig/ps/Makefile Mon Jul 10 19:16:47 2000
122 +++ procps-2.0.7/ps/Makefile Mon Aug 26 22:25:18 2002
127 - install $(OWNERGROUP) --mode a=rx --strip ps $(BINDIR)/ps
128 - install $(OWNERGROUP) --mode a=r ps.1 $(MAN1DIR)/ps.1
129 + install -d $(DESTDIR)$(BINDIR)
130 + install $(OWNERGROUP) --mode a=rx ps $(DESTDIR)$(BINDIR)/ps
131 + install -d $(DESTDIR)$(MAN1DIR)
132 + install $(OWNERGROUP) --mode a=r ps.1 $(DESTDIR)$(MAN1DIR)/ps.1
133 # The following does no harm and on older systems might help
134 - rm -f /var/catman/cat1/ps.1.gz /var/man/cat1/ps.1.gz
137 rm -f *.o DEADJOE *~ core ps gmon.out