Commit 9f2ff4ec authored by Jordan Sissel's avatar Jordan Sissel

- add lumberjack.sh wrapper to set LD_LIBRARY_PATH because I'm having

  issues with RPATH on debian 5 and need this working now.
parent 7adf2b60
......@@ -18,7 +18,9 @@ LIBS=-lzmq -ljemalloc -lssl -lcrypto -luuid -lz
CFLAGS+=-Ibuild/include
LDFLAGS+=-Lbuild/lib -Wl,-rpath,'$$ORIGIN/../lib'
default: build/bin/lumberjack
default: all
all: build/bin/lumberjack build/bin/lumberjack.sh
include Makefile.ext
ifeq ($(UNAME),Linux)
......@@ -37,7 +39,7 @@ vendor-clean:
-make -C vendor/zeromq/ clean
-make -C vendor/zlib/ clean
rpm deb: | build/bin/lumberjack
rpm deb: | all
fpm -s dir -t $@ -n lumberjack -v $(VERSION) --prefix /opt/lumberjack \
--exclude '*.a' --exclude 'lib/pkgconfig/zlib.pc' -C build \
--description "a log shipping tool" \
......@@ -96,6 +98,9 @@ build/test/test_ring: test_ring.o ring.o | build/test
proto.o: proto.c
$(CC) $(CFLAGS) -c -o $@ $^
build/bin/lumberjack.sh: lumberjack.sh | build/bin
install -m 755 $^ $@
build/bin/lumberjack: | build/bin
build/bin/lumberjack: lumberjack.o backoff.o harvester.o emitter.o str.o proto.o ring.o
$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
......
#!/bin/sh
dir=`dirname $0`
LD_LIBRARY_PATH="${dir}/../lib"
export LD_LIBRARY_PATH
exec "${dir}/lumberjack" "$@"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment