diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2005-12-27 11:46:41 +0000 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2005-12-27 11:46:41 +0000 |
| commit | 2703f338564540709ed09d798fcab0b071222c9b (patch) | |
| tree | c9498a44e4a9e58e3d35adde5081bab6707e6ee9 /rules/host-ipkg-utils.make | |
| parent | cf7502a4f62fe22c2d3a821c2e1ac2a28881317a (diff) | |
| download | ptxdist-2703f338564540709ed09d798fcab0b071222c9b.tar.gz ptxdist-2703f338564540709ed09d798fcab0b071222c9b.tar.xz | |
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/branches/ptxdist-0.7-destdir-r3569@3574 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/host-ipkg-utils.make')
| -rw-r--r-- | rules/host-ipkg-utils.make | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/rules/host-ipkg-utils.make b/rules/host-ipkg-utils.make index 991b486d0..1e56f0d67 100644 --- a/rules/host-ipkg-utils.make +++ b/rules/host-ipkg-utils.make @@ -17,7 +17,7 @@ HOST_PACKAGES-$(PTXCONF_HOSTTOOL_IPKG_UTILS) += hosttool-ipkg-utils # # Paths and names # -HOSTTOOL-IPKG-UTILS_VERSION = 050831 +HOSTTOOL-IPKG-UTILS_VERSION = 1.7 HOSTTOOL-IPKG-UTILS = ipkg-utils-$(HOSTTOOL-IPKG-UTILS_VERSION) HOSTTOOL-IPKG-UTILS_SUFFIX = tar.gz HOSTTOOL-IPKG-UTILS_URL = ftp://ftp.handhelds.org/packages/ipkg-utils/$(HOSTTOOL-IPKG-UTILS).$(HOSTTOOL-IPKG-UTILS_SUFFIX) @@ -54,9 +54,9 @@ $(STATEDIR)/hosttool-ipkg-utils.extract: $(hosttool-ipkg-utils_extract_deps) @$(call clean, $(HOSTTOOL-IPKG-UTILS_DIR)) @$(call extract, $(HOSTTOOL-IPKG-UTILS_SOURCE), $(HOST_BUILDDIR)) @$(call patchin, $(HOSTTOOL-IPKG-UTILS), $(HOSTTOOL-IPKG-UTILS_DIR)) - perl -i -p -e "s,^PREFIX=(.*),PREFIX=$(PTXCONF_PREFIX),g" \ + perl -i -p -e "s,^PREFIX=(.*),PREFIX=$(PTXCONF_HOST_PREFIX)/usr,g" \ $(HOSTTOOL-IPKG-UTILS_DIR)/Makefile - perl -i -p -e "s,^ python setup.py install, python setup.py install --prefix=$(PTXCONF_PREFIX),g" \ + perl -i -p -e "s,^ python setup.py install, python setup.py install --prefix=$(PTXCONF_HOST_PREFIX)/usr,g" \ $(HOSTTOOL-IPKG-UTILS_DIR)/Makefile @$(call touch, $@) @@ -100,13 +100,12 @@ hosttool-ipkg-utils_install: $(STATEDIR)/hosttool-ipkg-utils.install $(STATEDIR)/hosttool-ipkg-utils.install: $(STATEDIR)/hosttool-ipkg-utils.compile @$(call targetinfo, $@) - mkdir -p $(PTXCONF_PREFIX)/bin + mkdir -p $(PTXCONF_HOST_PREFIX)/usr/bin # ipkg.py is forgotten by MAKE_INSTALL, so we copy it manually # FIXME: this should probably be fixed upstream - cd $(HOSTTOOL-IPKG-UTILS_DIR) && (\ - $(HOSTTOOL-IPKG-UTILS_ENV) $(HOSTTOOL-IPKG-UTILS_PATH) $(MAKE_INSTALL) ;\ - cp -f ipkg.py $(PTXCONF_PREFIX)/bin/;\ - ) + @$(call install, HOSTTOOL-IPKG-UTILS,,h) + mkdir -p $(PTXCONF_HOST_PREFIX)/usr/bin + cp -f $(HOSTTOOL-IPKG-UTILS_DIR)/ipkg.py $(PTXCONF_HOST_PREFIX)/usr/bin/ @$(call touch, $@) # ---------------------------------------------------------------------------- |