diff options
| author | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-03-06 12:03:54 +0000 |
|---|---|---|
| committer | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-03-06 12:03:54 +0000 |
| commit | 3af82587f3b1a1cfa76bf7990dddf0548ad7f981 (patch) | |
| tree | 3d71937c64207297f0ce7fb2cbe33cd9a384b343 /package/zlib | |
| parent | 3a76715273993686d2ec2e4297912ef833bfaea9 (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/zlib')
| -rw-r--r-- | package/zlib/Makefile | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/package/zlib/Makefile b/package/zlib/Makefile index 522c1b675..6d9144f16 100644 --- a/package/zlib/Makefile +++ b/package/zlib/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 := zlib_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk +PKG_IPK := $(PACKAGE_DIR)/zlib_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk $(DL_DIR)/$(PKG_SOURCE_FILE): @@ -41,7 +41,7 @@ $(STAGING_DIR)/lib/libz.so: $(PKG_BUILD_DIR)/libz.so DESTDIR="$(STAGING_DIR)" \ install -$(PACKAGE_DIR)/$(PKG_IPK): $(STAGING_DIR)/lib/libz.so +$(PKG_IPK): $(STAGING_DIR)/lib/libz.so mkdir -p $(PACKAGE_DIR) $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_BUILD_DIR)/ipkg/zlib zlib.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) mkdir -p $(PKG_BUILD_DIR)/ipkg/zlib/usr/lib @@ -49,12 +49,14 @@ $(PACKAGE_DIR)/$(PKG_IPK): $(STAGING_DIR)/lib/libz.so $(STRIP) $(PKG_BUILD_DIR)/ipkg/zlib/usr/lib/* $(IPKG_BUILD) $(PKG_BUILD_DIR)/ipkg/zlib $(PACKAGE_DIR) +$(IPKG_STATE_DIR)/info/zlib.list: $(PKG_IPK) + $(IPKG) install $(PKG_IPK) source: $(DL_DIR)/$(PKG_SOURCE_FILE) prepare: $(PKG_BUILD_DIR)/.patched -compile: $(STAGING_DIR)/lib/libz.so $(PACKAGE_DIR)/$(PKG_IPK) -install: $(PKG_ZLIB) - $(IPKG) install $(PACKAGE_DIR)/$(PKG_IPK) +compile: $(STAGING_DIR)/lib/libz.so $(PKG_IPK) +install: $(PKG_ZLIB) $(IPKG_STATE_DIR)/info/zlib.list + clean: rm -rf $(PKG_BUILD_DIR) rm -f $(STAGING_DIR)/lib/libz* $(STAGING_DIR)/include/zlib* |