summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile6
-rw-r--r--libnsbmp.pc.in6
2 files changed, 7 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 53d214b..88741e1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
# Component settings
COMPONENT := nsbmp
+COMPONENT_VERSION := 0.0.1
# Default to a static library
COMPONENT_TYPE ?= lib-static
@@ -16,6 +17,7 @@ CFLAGS := $(CFLAGS) -std=c99 -D_BSD_SOURCE -I$(CURDIR)/include/ \
include build/makefiles/Makefile.top
# Extra installation rules
-INSTALL_ITEMS := $(INSTALL_ITEMS) /include:include/libnsbmp.h
+I := /include/libnsbmp$(major-version)
+INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libnsbmp.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)
diff --git a/libnsbmp.pc.in b/libnsbmp.pc.in
index 260cc9e..ff41b3e 100644
--- a/libnsbmp.pc.in
+++ b/libnsbmp.pc.in
@@ -5,6 +5,6 @@ includedir=${prefix}/include
Name: libnsbmp
Description: Provides bmp loading and conversion
-Version: 0.0.1
-Libs: -L${libdir} -lnsbmp
-Cflags: -I${includedir}
+Version: VERSION
+Libs: -L${libdir} -lnsbmpMAJOR
+Cflags: -I${includedir}/libnsbmpMAJOR