summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2009-04-21 23:16:09 (GMT)
committer John Mark Bell <jmb@netsurf-browser.org>2009-04-21 23:16:09 (GMT)
commite67f65e7d550050a4148abbf636209ad24634540 (patch)
tree331603835901cf3b12c89a80f8da8209f82a2dc5
parent8e6513c1c041086be02de50425a17c9817c48afc (diff)
downloadiconv-e67f65e7d550050a4148abbf636209ad24634540.tar.gz
iconv-e67f65e7d550050a4148abbf636209ad24634540.tar.bz2
Sync with core buildsystem
svn path=/trunk/iconv/; revision=7229
-rw-r--r--Makefile2
-rw-r--r--libiconv.pc.in4
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 18c224c..5773f07 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ endif
include build/makefiles/Makefile.top
# Extra installation rules
-I := /include/iconv$(major-version)/iconv
+I := /include/iconv
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/iconv/iconv.h
INSTALL_ITEMS := $(INSTALL_ITEMS) /lib/pkgconfig:lib$(COMPONENT).pc.in
INSTALL_ITEMS := $(INSTALL_ITEMS) /lib:$(OUTPUT)
diff --git a/libiconv.pc.in b/libiconv.pc.in
index d47d3a2..ad33fc7 100644
--- a/libiconv.pc.in
+++ b/libiconv.pc.in
@@ -6,5 +6,5 @@ includedir=${prefix}/include
Name: libiconv
Description: Character set conversion library
Version: VERSION
-Libs: -L${libdir} -liconvMAJOR -lunicode
-Cflags: -I${includedir}/iconvMAJOR
+Libs: -L${libdir} -liconv -lunicode
+Cflags: -I${includedir}