diff options
| author | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-04-18 06:37:11 +0000 |
|---|---|---|
| committer | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-04-18 06:37:11 +0000 |
| commit | 4b578a092831613bd23ec687944e627842699c87 (patch) | |
| tree | 7d5c8c1ec66036a32f3852e1328882bc69a97d4e | |
| parent | fb323b6c746abfa2e69973869eae2b995745cbd2 (diff) | |
Uniformize package Makefile, move ipkg related files to ./ipkg and patches to ./patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@666 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/zlib/Makefile | 12 | ||||
| -rw-r--r-- | package/zlib/ipkg/zlib.control (renamed from package/zlib/zlib.control) | 0 | ||||
| -rw-r--r-- | package/zlib/patches/zlib.patch (renamed from package/zlib/zlib.patch) | 0 |
3 files changed, 6 insertions, 6 deletions
diff --git a/package/zlib/Makefile b/package/zlib/Makefile index 5e05915e21..501b137983 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -24,7 +24,7 @@ $(DL_DIR)/$(PKG_SOURCE): $(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE) $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - $(PATCH) $(PKG_BUILD_DIR) . $(PKG_NAME).patch + $(PATCH) $(PKG_BUILD_DIR) ./patches touch $(PKG_BUILD_DIR)/.prepared $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared @@ -49,9 +49,9 @@ $(STAGING_DIR)/usr/lib/libz.so: $(PKG_BUILD_DIR)/.built install $(IPKG_ZLIB): $(STAGING_DIR)/usr/lib/libz.so - $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_ZLIB) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) + $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_ZLIB) ./ipkg/$(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) mkdir -p $(IDIR_ZLIB)/usr/lib - cp -a $(STAGING_DIR)/usr/lib/libz.so.* $(IDIR_ZLIB)/usr/lib/ + cp -fpR $(STAGING_DIR)/usr/lib/libz.so.* $(IDIR_ZLIB)/usr/lib/ $(STRIP) $(IDIR_ZLIB)/usr/lib/lib*.so* mkdir -p $(PACKAGE_DIR) $(IPKG_BUILD) $(IDIR_ZLIB) $(PACKAGE_DIR) @@ -65,7 +65,7 @@ compile: $(IPKG_ZLIB) install: $(INFO_ZLIB) clean: - -$(MAKE) -C $(PKG_BUILD_DIR) \ - DESTDIR="$(STAGING_DIR)" \ - uninstall + rm -rf $(STAGING_DIR)/usr/include/z{conf,lib}.h + rm -rf $(STAGING_DIR)/usr/lib/libz.{a,so*} + rm -rf $(STAGING_DIR)/usr/share/man/man*/zlib.* rm -rf $(PKG_BUILD_DIR) $(IPKG_ZLIB) diff --git a/package/zlib/zlib.control b/package/zlib/ipkg/zlib.control index e720f32822..e720f32822 100644 --- a/package/zlib/zlib.control +++ b/package/zlib/ipkg/zlib.control diff --git a/package/zlib/zlib.patch b/package/zlib/patches/zlib.patch index 8f5a9b5358..8f5a9b5358 100644 --- a/package/zlib/zlib.patch +++ b/package/zlib/patches/zlib.patch |