diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | libiconv.pc.in | 6 |
2 files changed, 7 insertions, 5 deletions
@@ -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 |