tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1diff --git a/config.mk b/config.mk
2index 1ebfd49..ec076b3 100644
3--- a/config.mk
4+++ b/config.mk
5@@ -1,25 +1,17 @@
6 # Customize to fit your system
7
8 # paths
9-PREFIX = /usr/local/plan9
10 MANPREFIX = ${PREFIX}/share/man
11
12 VERSION = 7
13-OBJTYPE = 386
14-#OBJTYPE = arm
15-#OBJTYPE = x86_64
16-#OBJTYPE = sun4u
17
18 # Linux/BSD
19 #CFLAGS += -Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -c -I. -DPREFIX="\"${PREFIX}\""
20 CFLAGS += -c -I. -DPLAN9PORT -DPREFIX="\"${PREFIX}\""
21-LDFLAGS += -static
22
23 # Solaris
24 #CFLAGS = -fast -xtarget=ultra -D__sun__ -c -I. -DPREFIX="\"${PREFIX}\""
25 #LDFLAGS = -dn
26
27 # compiler
28-AR = ar rc
29-CC = cc
30 YACC = ../yacc/9yacc
31diff --git a/lib9/Makefile b/lib9/Makefile
32index b83ab2b..e3744a4 100644
33--- a/lib9/Makefile
34+++ b/lib9/Makefile
35@@ -221,7 +221,7 @@ uninstall:
36
37 ${LIB}: ${OFILES}
38 @echo AR ${TARG}
39- @${AR} ${LIB} ${OFILES}
40+ @${AR} rc ${LIB} ${OFILES}
41
42 .c.o:
43 @echo CC $<
44diff --git a/troff/Makefile b/troff/Makefile
45index b4e3d88..3aac6bf 100644
46--- a/troff/Makefile
47+++ b/troff/Makefile
48@@ -6,7 +6,7 @@ TARG = troff
49 OFILES = n1.o n2.o n3.o n4.o n5.o t6.o n6.o n7.o n8.o n9.o t10.o\
50 n10.o t11.o ni.o hytab.o suftab.o dwbinit.o mbwc.o
51 MANFILES = troff.1
52-TROFFDIR = ${PREFIX}/lib/troff
53+TROFFDIR = ${PREFIX_TROFF}/lib/troff
54
55 include ../std.mk
56