libsh installs

diff --git a/free/libs/Makefile b/free/libs/Makefile
index 09f2c02cd9bbd2f6e98b864894589f07abe3ce20..41eef5f94b17fa2997150b45ddfa069aeab91535 100644 (file)
--- a/free/libs/Makefile
+++ b/free/libs/Makefile
@@ -25,6 +25,7 @@ CONFIGS+=sherlock local
 # Set up names of common libraries (to avoid forward references in rules)
 LIBCHARSET=$(o)/charset/libcharset.pc
 LIBSH=$(o)/sherlock/libsh.pc
+LIBSHXML=$(o)/sherlock/xml/libshxml.pc
 
 # Include makefiles of libraries we wish to use
 include $(s)/charset/Makefile

diff --git a/sherlock/xml/Makefile b/sherlock/xml/Makefile
index 8b9af859debedd9fdd027105702f2e980f1b5c98..73472c2dad240c495558f3b0149a4efef4958022 100644 (file)
--- a/sherlock/xml/Makefile
+++ b/sherlock/xml/Makefile
@@ -35,3 +35,18 @@ API_INCLUDES+=$(o)/sherlock/xml/.include-stamp
 $(o)/sherlock/xml/.include-stamp: $(addprefix $(s)/sherlock/xml/,$(LIBSHXML_INCLUDES))
 $(o)/sherlock/xml/.include-stamp: IDST=sherlock/xml
 run/lib/pkgconfig/libshxml.pc: $(o)/sherlock/xml/libshxml.pc
+
+ifdef CONFIG_SHARED
+LIBSHXML_NAME=libshxml.so
+else
+LIBSHXML_NAME=libshxml.a
+endif
+
+INSTALL_TARGETS+=install-sh-xml
+install-sh-xml:
+       install -d -m 755 $(DESTDIR)$(INSTALL_INCLUDE_DIR)/sherlock/xml $(DESTDIR)$(INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)
+       install -m 644 $(addprefix run/include/sherlock/xml/,$(LIBSHXML_INCLUDES)) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/sherlock/xml
+       install -m 644 run/lib/pkgconfig/libshxml.pc $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)
+       install -m 644 run/lib/$(LIBSHXML_NAME) $(DESTDIR)$(INSTALL_LIB_DIR)
+
+.PHONY: install-sh-xml