34 lines
1.2 KiB
Plaintext
34 lines
1.2 KiB
Plaintext
$OpenBSD: patch-Makefile,v 1.4 2014/09/23 12:09:40 ajacoutot Exp $
|
|
--- Makefile.orig Wed Apr 9 18:13:27 2014
|
|
+++ Makefile Mon Sep 22 15:11:10 2014
|
|
@@ -1,5 +1,5 @@
|
|
CFLAGS=-g -O2 -Wall -Wextra -Isrc -Isrc/polarssl/include -pthread -rdynamic -DNDEBUG $(OPTFLAGS) -D_FILE_OFFSET_BITS=64
|
|
-LIBS=-lzmq -ldl -lsqlite3 $(OPTLIBS)
|
|
+LIBS=-lzmq -lsqlite3 $(OPTLIBS)
|
|
PREFIX?=/usr/local
|
|
|
|
get_objs = $(addsuffix .o,$(basename $(wildcard $(1))))
|
|
@@ -18,7 +18,7 @@ MAKEOPTS=OPTFLAGS="${NOEXTCFLAGS} ${OPTFLAGS}" OPTLIBS
|
|
ifdef $($(shell sh init.sh))
|
|
endif
|
|
|
|
-all: bin/mongrel2 tests m2sh procer
|
|
+all: bin/mongrel2 m2sh procer
|
|
|
|
dev: CFLAGS=-g -Wall -Isrc -Wall -Wextra $(OPTFLAGS) -D_FILE_OFFSET_BITS=64
|
|
dev: all
|
|
@@ -102,10 +102,9 @@ config_modules: build/libm2.a
|
|
${MAKE} ${MAKEOPTS} -C tools/config_modules all
|
|
|
|
# Try to install first before creating target directory and trying again
|
|
-install: all
|
|
- install bin/mongrel2 $(DESTDIR)/$(PREFIX)/bin/ \
|
|
- || ( install -d $(DESTDIR)/$(PREFIX)/bin/ \
|
|
- && install bin/mongrel2 $(DESTDIR)/$(PREFIX)/bin/ )
|
|
+install:
|
|
+ install -d $(PREFIX)/bin/
|
|
+ install bin/mongrel2 $(PREFIX)/bin/
|
|
${MAKE} ${MAKEOPTS} -C tools/m2sh install
|
|
${MAKE} ${MAKEOPTS} -C tools/config_modules install
|
|
${MAKE} ${MAKEOPTS} -C tools/filters install
|