summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile19
1 files changed, 10 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index be2666a..8ad3d20 100644
--- a/Makefile
+++ b/Makefile
@@ -79,11 +79,11 @@
# Destinations for installation. $(PRESERVEDIR) is used for recovery files.
# It will get mode 1777.
#
-PREFIX=/home/tmu/.local
+PREFIX ?=/usr/local
BINDIR = $(PREFIX)/bin
LIBEXECDIR = $(PREFIX)/libexec
MANDIR = $(PREFIX)/share/man
-PRESERVEDIR=/tmp/ex-preserve/
+PRESERVEDIR = /tmp/ex-preserve/
#
# DESTDIR is prepended to the installation paths. It is mostly useful
@@ -94,7 +94,7 @@ DESTDIR =
#
# A BSD-like install program. GNU install will fit well here, too.
#
-INSTALL=/usr/bin/install
+INSTALL =/usr/bin/install
#
# Compiler and linker flags.
@@ -247,16 +247,16 @@ OBJS = ex.o ex_addr.o ex_cmds.o ex_cmds2.o ex_cmdsub.o \
ex_set.o ex_subr.o ex_tagio.o ex_temp.o ex_tty.o ex_unix.o \
ex_v.o ex_vadj.o ex_vget.o ex_vmain.o ex_voper.o \
ex_vops.o ex_vops2.o ex_vops3.o ex_vput.o ex_vwind.o \
- printf.o ex_version.o $(MALLOC)
+ printf.o ex_version.o $(MALLOC) brk_shim.o
HDRS = ex.h ex_argv.h ex_re.h ex_temp.h ex_tty.h ex_tune.h ex_vars.h \
- ex_vis.h libterm/libterm.h
+ ex_vis.h libterm/libterm.h brk_shim.h
SRC1 = ex.c ex_addr.c ex_cmds.c ex_cmds2.c ex_cmdsub.c
SRC2 = ex_data.c ex_get.c ex_io.c ex_put.c ex_re.c
SRC3 = ex_set.c ex_subr.c ex_tagio.c ex_temp.c ex_tty.c ex_unix.c
SRC4 = ex_v.c ex_vadj.c ex_vget.c ex_vmain.c ex_voper.c
SRC5 = ex_vops.c ex_vops2.c ex_vops3.c ex_vput.c ex_vwind.c
SRC6 = printf.c expreserve.c exrecover.c ex_version.c
-SRC7 = mapmalloc.c malloc.c
+SRC7 = mapmalloc.c brk_shim.c #malloc.c
.SUFFIXES: .o .c
.c.o: ; $(CC) $(CCFLAGS) -c $<
@@ -271,8 +271,8 @@ $(TLIB): libterm/termcap.c libterm/tgoto.c libterm/tputs.c libterm/libterm.h
@cd libterm && $(MAKE) CC="$(CC)" \
COPT="$(CFLAGS) $(WARN) $(CPPFLAGS) $(OSTYPE)"
-exrecover: exrecover.o $(MALLOC)
- $(CC) -o exrecover $(LDFLAGS) exrecover.o $(MALLOC) $(LDADD)
+exrecover: exrecover.o $(MALLOC) brk_shim.o
+ $(CC) -o exrecover $(LDFLAGS) exrecover.o brk_shim.o $(MALLOC) $(LDADD)
expreserve: expreserve.o
$(CC) -o expreserve $(LDFLAGS) expreserve.o $(LDADD)
@@ -403,6 +403,7 @@ ex_vwind.o: libterm/libterm.h
expreserve.o: config.h
exrecover.o: config.h ex.h ex_proto.h ex_temp.h ex_tty.h ex_tune.h ex_vars.h
exrecover.o: libterm/libterm.h
-malloc.o: config.h
+# malloc.o: config.h
mapmalloc.o: config.h
printf.o: config.h
+brk_shim.o: brk_shim.h