From 00308546f4c76f1e95b165f9a83cbef9f030c69b Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sat, 25 Oct 2014 00:43:57 +0200 Subject: [PATCH] Avoid using $(LIBDIR) when not really available --- tools/Makefile | 4 ++-- tools/project.conf | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index faa1609..f35f1f6 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -33,14 +33,14 @@ panel-message: $(panel-message_OBJS) panel-notify_OBJS = notify.o panel-notify_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) -D PREFIX=\"$(PREFIX)\" $(CFLAGSF) $(CFLAGS) -panel-notify_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -L../src -Wl,-rpath,$(LIBDIR) -lPanel +panel-notify_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -L../src -Wl,-rpath,$(PREFIX)/lib -lPanel panel-notify: $(panel-notify_OBJS) $(CC) -o panel-notify $(panel-notify_OBJS) $(panel-notify_LDFLAGS) panel-test_OBJS = test.o panel-test_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) -D PREFIX=\"$(PREFIX)\" $(CFLAGSF) $(CFLAGS) -panel-test_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -L../src -Wl,-rpath,$(LIBDIR) -lPanel +panel-test_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -L../src -Wl,-rpath,$(PREFIX)/lib -lPanel panel-test: $(panel-test_OBJS) $(CC) -o panel-test $(panel-test_OBJS) $(panel-test_LDFLAGS) diff --git a/tools/project.conf b/tools/project.conf index d3787ff..f6f5b1d 100644 --- a/tools/project.conf +++ b/tools/project.conf @@ -22,15 +22,15 @@ install=$(BINDIR) type=binary cppflags=-D PREFIX=\"$(PREFIX)\" #cflags=`pkg-config --cflags gtk+-x11-3.0` -#ldflags=`pkg-config --libs gtk+-x11-3.0` -L../src -Wl,-rpath,$(LIBDIR) -lPanel -ldflags=-L../src -Wl,-rpath,$(LIBDIR) -lPanel +#ldflags=`pkg-config --libs gtk+-x11-3.0` -L../src -Wl,-rpath,$(PREFIX)/lib -lPanel +ldflags=-L../src -Wl,-rpath,$(PREFIX)/lib -lPanel sources=notify.c install=$(BINDIR) [panel-test] type=binary cppflags=-D PREFIX=\"$(PREFIX)\" -ldflags=-L../src -Wl,-rpath,$(LIBDIR) -lPanel +ldflags=-L../src -Wl,-rpath,$(PREFIX)/lib -lPanel sources=test.c [wifibrowser]