summaryrefslogtreecommitdiff
path: root/sysutils/psmisc/patches/patch-aa
blob: 52000c74b1aeb28f655d26e39fe5f9d80055edb1 (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
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
--- Makefile.orig	Mon Jul 28 10:28:00 1997
+++ Makefile	Sun Jul 19 17:35:06 1998
@@ -3,11 +3,11 @@
   -Wall -Wno-parentheses -Wwrite-strings -Wpointer-arith \
   # -Wcast-align -Wconversion -g
 LDFLAGS=#-s -N #-Xlinker -qmagic
-REAL_CPP=/lib/cpp
-PROGS=killall pstree fuser
-EBINDIR=/bin		# essential binaries
-BINDIR=/usr/bin		# not so essential ones
-MANDIR=/usr/man/man1	# all man pages
+REAL_CPP=/usr/bin/cpp
+PROGS=killall pstree #fuser
+EBINDIR=$(PREFIX)/bin		# essential binaries
+BINDIR=$(PREFIX)/bin		# not so essential ones
+MANDIR=$(PREFIX)/man/man1	# all man pages
 
 all:		$(PROGS)
 
@@ -18,34 +18,26 @@
 \2,"\1" },:p;d' \
 		  > signames.h
 
-signals.o:	signals.h signals.c signames.h Makefile
+signals.o:	signals.h signals.c Makefile
 
 fuser.o:	fuser.c comm.h signals.h Makefile VERSION
 killall.o:	killall.c comm.h signals.h Makefile VERSION
 
 fuser:		fuser.o signals.o
 killall:	killall.o signals.o
+		$(CC) $(LDFLAGS) -o killall killall.o signals.o
 
 pstree:		pstree.c comm.h Makefile VERSION
 		$(CC) $(CFLAGS) $(LDFLAGS) -o pstree pstree.c -ltermcap
 
 install:	$(PROGS)
 #		EBINDIR is expected to exist, so we don't try to create it
-		install -o 0 -g 0 -m 555 fuser $(EBINDIR)
-		[ -d $(BINDIR) ] || install -d -o 0 -g 0 -m 755 $(BINDIR)
-		install -o 0 -g 0 -m 555 killall $(BINDIR)
-		install -o 0 -g 0 -m 555 pstree $(BINDIR)
-		[ -d $(MANDIR) ] || install -d -o 0 -g 0 -m 755 $(MANDIR)
-		install -o 0 -g 0 -m 444 fuser.1 $(MANDIR)
-		install -o 0 -g 0 -m 444 killall.1 $(MANDIR)
-		install -o 0 -g 0 -m 444 pstree.1 $(MANDIR)
-
-install-pidof:
-		@[ -x `echo $(BINDIR)`/killall ] || { \
-		  echo "Need `echo $(BINDIR)`/killall to install pidof"; \
-		  exit 1 }
+		$(BSD_INSTALL_PROGRAM) killall $(BINDIR)
+		$(BSD_INSTALL_PROGRAM) pstree $(BINDIR)
+		$(BSD_INSTALL_MAN) killall.1 $(MANDIR)
+		$(BSD_INSTALL_MAN) pstree.1 $(MANDIR)
 		ln -sf killall `echo $(BINDIR)`/pidof
-		install -o 0 -g 0 -m 444 pidof.1 $(MANDIR)
+		$(BSD_INSTALL_MAN) pidof.1 $(MANDIR)
 
 clean:
 		rm -f *.o signames.h