From 107e5814538b4a5b85107c7ac6078ff870073aa6 Mon Sep 17 00:00:00 2001 From: Douglas William Thrift Date: Mon, 23 Nov 2009 03:25:24 +0000 Subject: [PATCH] Fix build on FreeBSD. --- FreeBSD.mk | 2 +- PkgConfig.mk | 2 +- makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/FreeBSD.mk b/FreeBSD.mk index ac4b846..c8b2607 100644 --- a/FreeBSD.mk +++ b/FreeBSD.mk @@ -1,3 +1,3 @@ export PATH := /usr/local/bin:/usr/local/GNUstep/System/Tools:$(PATH) -gcc := g++44 +gcc := g++42 include PkgConfig.mk diff --git a/PkgConfig.mk b/PkgConfig.mk index 47fb41f..368bbcc 100644 --- a/PkgConfig.mk +++ b/PkgConfig.mk @@ -1,6 +1,6 @@ ifneq ($(shell pkg-config webkit-1.0 --modversion 2>/dev/null),) flags += $(shell pkg-config --cflags webkit-1.0) -library += -lwebkit-1.0 +library += $(shell pkg-config --libs webkit-1.0) include Execute.mk else ifneq ($(shell pkg-config WebKitGtk --modversion 2>/dev/null),) diff --git a/makefile b/makefile index 89e5475..25482bc 100644 --- a/makefile +++ b/makefile @@ -37,7 +37,7 @@ filters := #E4X ldid := true entitle := $(ldid) dll := so -apr := -lapr-1 +apr := $(shell apr-1-config --link-ld) library := console := $(apr) -lreadline depends := -- 2.49.0