afe55fc796
Most patches were accepted upstream. One new patch for the internal copy of polarssl that was already accepted upstream.
33 lines
1.2 KiB
Plaintext
33 lines
1.2 KiB
Plaintext
$OpenBSD: patch-Makefile,v 1.2 2011/07/06 01:23:50 jeremy Exp $
|
|
--- Makefile.orig Wed Jun 22 09:25:12 2011
|
|
+++ Makefile Thu Jun 30 08:50:40 2011
|
|
@@ -1,5 +1,5 @@
|
|
CFLAGS=-g -O2 -Wall -Wextra -Isrc -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))))
|
|
@@ -16,7 +16,7 @@ TEST_SRC=$(wildcard tests/*_tests.c)
|
|
TESTS=$(patsubst %.c,%,${TEST_SRC})
|
|
MAKEOPTS=OPTFLAGS="${NOEXTCFLAGS} ${OPTFLAGS}" OPTLIBS="${OPTLIBS}" LIBS="${LIBS}" DESTDIR="${DESTDIR}" PREFIX="${PREFIX}"
|
|
|
|
-all: bin/mongrel2 tests m2sh
|
|
+all: bin/mongrel2 m2sh
|
|
|
|
dev: CFLAGS=-g -Wall -Isrc -Wall -Wextra $(OPTFLAGS) -D_FILE_OFFSET_BITS=64
|
|
dev: all
|
|
@@ -93,9 +93,9 @@ filters: build/libm2.a
|
|
config_modules: build/libm2.a
|
|
${MAKE} ${MAKEOPTS} -C tools/config_modules all
|
|
|
|
-install: all
|
|
- 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
|