Changeset 666


Ignore:
Timestamp:
2005-04-18T08:37:11+02:00 (13 years ago)
Author:
nico
Message:

Uniformize package Makefile, move ipkg related files to ./ipkg and patches to ./patches

Location:
trunk/openwrt/package/zlib
Files:
4 added
2 deleted
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/openwrt/package/zlib/Makefile

    r640 r666  
    2525$(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE) 
    2626        $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - 
    27         $(PATCH) $(PKG_BUILD_DIR) . $(PKG_NAME).patch 
     27        $(PATCH) $(PKG_BUILD_DIR) ./patches 
    2828        touch $(PKG_BUILD_DIR)/.prepared 
    2929 
     
    5050 
    5151$(IPKG_ZLIB): $(STAGING_DIR)/usr/lib/libz.so 
    52         $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_ZLIB) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) 
     52        $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_ZLIB) ./ipkg/$(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) 
    5353        mkdir -p $(IDIR_ZLIB)/usr/lib 
    54         cp -a $(STAGING_DIR)/usr/lib/libz.so.* $(IDIR_ZLIB)/usr/lib/ 
     54        cp -fpR $(STAGING_DIR)/usr/lib/libz.so.* $(IDIR_ZLIB)/usr/lib/ 
    5555        $(STRIP) $(IDIR_ZLIB)/usr/lib/lib*.so* 
    5656        mkdir -p $(PACKAGE_DIR) 
     
    6666 
    6767clean: 
    68         -$(MAKE) -C $(PKG_BUILD_DIR) \ 
    69                 DESTDIR="$(STAGING_DIR)" \ 
    70                 uninstall 
     68        rm -rf $(STAGING_DIR)/usr/include/z{conf,lib}.h 
     69        rm -rf $(STAGING_DIR)/usr/lib/libz.{a,so*} 
     70        rm -rf $(STAGING_DIR)/usr/share/man/man*/zlib.* 
    7171        rm -rf $(PKG_BUILD_DIR) $(IPKG_ZLIB) 
Note: See TracChangeset for help on using the changeset viewer.