diff options
| author | Jiri Slachta <jiri.slachta@gmail.com> | 2018-03-01 10:48:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-01 10:48:31 +0100 |
| commit | 1d579e7867808bcf1731371060aa98d8868bff8b (patch) | |
| tree | 6d982a6f7542fa048188ded5c069359ee2fe4eef /libs | |
| parent | 194f33e3634fdead3bf30e2134b51817cd36c3fb (diff) | |
| parent | 54512199ee72aef1de3e6eaf9d12ca90b63b8fa2 (diff) | |
Merge pull request #5671 from micmac1/xslt-up
libxslt: remove $(FPIC), clean up install defines
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/libxslt/Makefile | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libs/libxslt/Makefile b/libs/libxslt/Makefile index 9f276d3fd..8c546c831 100644 --- a/libs/libxslt/Makefile +++ b/libs/libxslt/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libxslt PKG_VERSION:=1.1.32 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:= \ @@ -54,7 +54,7 @@ endef define Package/xsltproc SECTION:=utils CATEGORY:=Utilities - DEPENDS:=+libxml2 +libxslt +libexslt + DEPENDS:=+libxslt +PACKAGE_xsltproc:libexslt TITLE:=Gnome XSLT xsltproc Utility URL:=http://xmlsoft.org/XSLT/ endef @@ -73,8 +73,6 @@ CONFIGURE_ARGS+= \ --without-mem-debug \ --without-debugger \ -TARGET_CFLAGS += $(FPIC) - define Build/InstallDev/Xslt $(INSTALL_DIR) $(1)/usr/bin $(2)/bin $(1)/usr/include/libxslt \ $(1)/usr/include/libexslt $(1)/usr/lib \ @@ -130,14 +128,14 @@ endef define Package/libxslt/install $(INSTALL_DIR) $(1)/usr/lib $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/libxslt.so.* \ + $(PKG_INSTALL_DIR)/usr/lib/libxslt.so* \ $(1)/usr/lib/ endef define Package/libexslt/install $(INSTALL_DIR) $(1)/usr/lib $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/libexslt.so.* \ + $(PKG_INSTALL_DIR)/usr/lib/libexslt.so* \ $(1)/usr/lib/ endef |