summaryrefslogtreecommitdiffstats
path: root/package/lzo
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-03-06 12:03:54 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-03-06 12:03:54 +0000
commit3af82587f3b1a1cfa76bf7990dddf0548ad7f981 (patch)
tree3d71937c64207297f0ce7fb2cbe33cd9a384b343 /package/lzo
parent3a76715273993686d2ec2e4297912ef833bfaea9 (diff)
Add package install dependencies (don't install a package if it's already installed)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@315 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/lzo')
-rw-r--r--package/lzo/Makefile13
1 files changed, 8 insertions, 5 deletions
diff --git a/package/lzo/Makefile b/package/lzo/Makefile
index 8d7398194..414ec3eb2 100644
--- a/package/lzo/Makefile
+++ b/package/lzo/Makefile
@@ -9,7 +9,7 @@ PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_CAT := zcat
PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION)
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR)
-PKG_IPK := $(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
+PKG_IPK := $(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
$(DL_DIR)/$(PKG_SOURCE_FILE):
@@ -49,7 +49,7 @@ $(STAGING_DIR)/lib/liblzo.a: $(PKG_BUILD_DIR)/src/liblzo.la
DESTDIR="$(STAGING_DIR)" \
install
-$(PACKAGE_DIR)/$(PKG_IPK): $(STAGING_DIR)/lib/liblzo.a
+$(PKG_IPK): $(STAGING_DIR)/lib/liblzo.a
mkdir -p $(PACKAGE_DIR)
$(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_BUILD_DIR)/ipkg/lzo lzo.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
mkdir -p $(PKG_BUILD_DIR)/ipkg/lzo/usr/lib
@@ -57,11 +57,14 @@ $(PACKAGE_DIR)/$(PKG_IPK): $(STAGING_DIR)/lib/liblzo.a
$(STRIP) $(PKG_BUILD_DIR)/ipkg/lzo/usr/lib/*
$(IPKG_BUILD) $(PKG_BUILD_DIR)/ipkg/lzo $(PACKAGE_DIR)
+$(IPKG_STATE_DIR)/info/lzo.list: $(PKG_IPK)
+ $(IPKG) install $(PKG_IPK)
+
source: $(DL_DIR)/$(PKG_SOURCE_FILE)
prepare: $(PKG_BUILD_DIR)/.patched
-compile: $(STAGING_DIR)/lib/liblzo.a $(PACKAGE_DIR)/$(PKG_IPK)
-install: $(PKG_ZLIB)
- $(IPKG) install $(PACKAGE_DIR)/$(PKG_IPK)
+compile: $(STAGING_DIR)/lib/liblzo.a $(PKG_IPK)
+install: $(IPKG_STATE_DIR)/info/lzo.list
+
clean:
rm -rf $(PKG_BUILD_DIR)
rm -f $(STAGING_DIR)/lib/liblzo*