diff options
author | John Mark Bell <jmb@netsurf-browser.org> | 2009-04-21 23:16:09 +0000 |
---|---|---|
committer | John Mark Bell <jmb@netsurf-browser.org> | 2009-04-21 23:16:09 +0000 |
commit | e67f65e7d550050a4148abbf636209ad24634540 (patch) | |
tree | 331603835901cf3b12c89a80f8da8209f82a2dc5 | |
parent | 8e6513c1c041086be02de50425a17c9817c48afc (diff) | |
download | iconv-e67f65e7d550050a4148abbf636209ad24634540.tar.gz iconv-e67f65e7d550050a4148abbf636209ad24634540.tar.bz2 |
Sync with core buildsystem
svn path=/trunk/iconv/; revision=7229
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | libiconv.pc.in | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -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} |