summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2009-04-03 01:54:26 (GMT)
committer John Mark Bell <jmb@netsurf-browser.org>2009-04-03 01:54:26 (GMT)
commite55e75be07b28dd3fa85bc4530f230b84267efc2 (patch)
tree3f655ac9c75255d1033e5f9b884ca454482a3546
parent2d8700ca0761ad51b44aea03e8a663a95bd263a8 (diff)
downloadiconv-e55e75be07b28dd3fa85bc4530f230b84267efc2.tar.gz
iconv-e55e75be07b28dd3fa85bc4530f230b84267efc2.tar.bz2
Shared library versioning
svn path=/trunk/iconv/; revision=7035
-rw-r--r--Makefile6
-rw-r--r--libiconv.pc.in6
2 files changed, 7 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index d5d700b..18c224c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
# Component settings
COMPONENT := iconv
+COMPONENT_VERSION := 0.10.0
# Default to a static library
COMPONENT_TYPE ?= lib-static
@@ -28,9 +29,10 @@ endif
include build/makefiles/Makefile.top
# Extra installation rules
-INSTALL_ITEMS := $(INSTALL_ITEMS) /include/iconv:include/iconv/iconv.h
+I := /include/iconv$(major-version)/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:$(BUILDDIR)/lib$(COMPONENT)$(LIBEXT)
+INSTALL_ITEMS := $(INSTALL_ITEMS) /lib:$(OUTPUT)
ifeq ($(COMPONENT_TYPE),riscos-module)
# And the RISC OS-specific targets
diff --git a/libiconv.pc.in b/libiconv.pc.in
index 1b3ccfc..d47d3a2 100644
--- a/libiconv.pc.in
+++ b/libiconv.pc.in
@@ -5,6 +5,6 @@ includedir=${prefix}/include
Name: libiconv
Description: Character set conversion library
-Version: 0.0.1
-Libs: -L${libdir} -liconv -lunicode
-Cflags: -I${includedir}
+Version: VERSION
+Libs: -L${libdir} -liconvMAJOR -lunicode
+Cflags: -I${includedir}/iconvMAJOR