From 2b303df06ea14e99e41b118b299bb0bcf58aafd5 Mon Sep 17 00:00:00 2001
From: John Mark Bell <jmb@netsurf-browser.org>
Date: Tue, 21 Apr 2009 23:11:48 +0000
Subject: Sync with core buildsystem changes

svn path=/trunk/libnsfb/; revision=7227
---
 Makefile      | 4 ++--
 libnsfb.pc.in | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index d6c1764..e94ee66 100644
--- a/Makefile
+++ b/Makefile
@@ -19,12 +19,12 @@ CFLAGS := -g $(CFLAGS) -std=c99 -D_BSD_SOURCE -I$(CURDIR)/include/ \
 	-I$(CURDIR)/src $(WARNFLAGS) 
 
 # TODO: probably want to retrieve SDL from pkg-config
-TESTLDFLAGS = -Wl,--whole-archive -l$(COMPONENT)$(major-version) -Wl,--no-whole-archive -lSDL
+TESTLDFLAGS = -Wl,--whole-archive -l$(COMPONENT) -Wl,--no-whole-archive -lSDL
 
 include build/makefiles/Makefile.top
 
 # Extra installation rules
-I := /include/libnsfb$(major-version)
+I := /include
 INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libnsfb.h
 INSTALL_ITEMS := $(INSTALL_ITEMS) /lib/pkgconfig:lib$(COMPONENT).pc.in
 INSTALL_ITEMS := $(INSTALL_ITEMS) /lib:$(OUTPUT)
diff --git a/libnsfb.pc.in b/libnsfb.pc.in
index fe99142..b3a25b2 100644
--- a/libnsfb.pc.in
+++ b/libnsfb.pc.in
@@ -6,5 +6,5 @@ includedir=${prefix}/include
 Name: libnsfb
 Description: Provides framebuffer access for netsurf.
 Version: VERSION
-Libs: -L${libdir} -lnsfbMAJOR
-Cflags: -I${includedir}/libnsfbMAJOR
+Libs: -L${libdir} -lnsfb
+Cflags: -I${includedir}
-- 
cgit v1.2.3