diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2005-11-04 09:16:03 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2005-11-04 09:16:03 +0000 |
| commit | 751867b08b69e063bae095259c278c595ed610b3 (patch) | |
| tree | cc55f3342863f62b68d06963c2fc184851635fd0 /rules/xmlstarlet.make | |
| parent | ebcf13306cfb363369cbd8918acc77b3c7558ff7 (diff) | |
| download | ptxdist-751867b08b69e063bae095259c278c595ed610b3.tar.gz ptxdist-751867b08b69e063bae095259c278c595ed610b3.tar.xz | |
* rules/xmlstarlet.make:
changed executable name from "xml" to "xmlstarlet",
added "--with-libiconv-prefix" to configure, otherwise a /usr/include leaks in
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.7-trunk@3304 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/xmlstarlet.make')
| -rw-r--r-- | rules/xmlstarlet.make | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/rules/xmlstarlet.make b/rules/xmlstarlet.make index 0b3e3ee23..727b10aeb 100644 --- a/rules/xmlstarlet.make +++ b/rules/xmlstarlet.make @@ -32,11 +32,13 @@ XMLSTARLET_DIR = $(BUILDDIR)/$(XMLSTARLET) xmlstarlet_get: $(STATEDIR)/xmlstarlet.get -xmlstarlet_get_deps = $(XMLSTARLET_SOURCE) +xmlstarlet_get_deps = \ + $(XMLSTARLET_SOURCE) \ + $(RULESDIR)/xmlstarlet.make + $(STATEDIR)/xmlstarlet.get: $(xmlstarlet_get_deps) @$(call targetinfo, $@) - @$(call get_patches, $(XMLSTARLET)) $(call touch, $@) $(XMLSTARLET_SOURCE): @@ -74,16 +76,16 @@ xmlstarlet_prepare_deps += $(STATEDIR)/libxslt.install XMLSTARLET_PATH = PATH=$(CROSS_PATH) XMLSTARLET_ENV = $(CROSS_ENV) -#XMLSTARLET_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig -#XMLSTARLET_ENV += # # autoconf # -XMLSTARLET_AUTOCONF = $(CROSS_AUTOCONF) -XMLSTARLET_AUTOCONF += --prefix=$(CROSS_LIB_DIR) -XMLSTARLET_AUTOCONF += --with-libxml-prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) -XMLSTARLET_AUTOCONF += --with-libxslt-prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) +XMLSTARLET_AUTOCONF = \ + $(CROSS_AUTOCONF) \ + --prefix=$(CROSS_LIB_DIR) \ + --with-libxml-prefix=$(CROSS_LIB_DIR) \ + --with-libxslt-prefix=$(CROSS_LIB_DIR) \ + --with-libiconv-prefix=$(CROSS_LIB_DIR) $(STATEDIR)/xmlstarlet.prepare: $(xmlstarlet_prepare_deps) @$(call targetinfo, $@) @@ -139,7 +141,7 @@ $(STATEDIR)/xmlstarlet.targetinstall: $(xmlstarlet_targetinstall_deps) @$(call install_fixup,DEPENDS,) @$(call install_fixup,DESCRIPTION,missing) - @$(call install_copy, 0, 0, 0755, $(XMLSTARLET_DIR)/src/xml, /usr/bin/xml) + @$(call install_copy, 0, 0, 0755, $(XMLSTARLET_DIR)/src/xml, /usr/bin/xmlstarlet) @$(call install_finish) |