Changeset 836


Ignore:
Timestamp:
2005-05-12T20:16:36+02:00 (13 years ago)
Author:
nbd
Message:

clean up popt package

File:
1 edited

Legend:

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

    r817 r836  
    88PKG_MD5SUM:=5988e7aeb0ae4dac8d83561265984cc9 
    99 
    10 PKG_SOURCE_URL:= \ 
    11         ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/ \ 
    12         http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/ 
     10PKG_SOURCE_URL:=ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/ 
    1311PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    1412PKG_CAT:=zcat 
     
    2119$(eval $(call PKG_template,LIBPOPT,libpopt,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
    2220 
    23 $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared 
     21$(PKG_BUILD_DIR)/.configured: 
    2422        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ 
    2523                $(TARGET_CONFIGURE_OPTS) \ 
     
    5250        touch $(PKG_BUILD_DIR)/.configured 
    5351 
    54 $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured 
     52$(PKG_BUILD_DIR)/.built: 
    5553        $(MAKE) -C $(PKG_BUILD_DIR) 
    5654        touch $(PKG_BUILD_DIR)/.built 
     
    6260        rm -f $(STAGING_DIR)/usr/lib/libpopt.la 
    6361 
    64 $(IPKG_LIBPOPT): $(IDIR_LIBPOPT)/CONTROL/control $(STAGING_DIR)/usr/lib/libpopt.so 
     62$(IPKG_LIBPOPT): 
    6563        mkdir -p $(IDIR_LIBPOPT)/usr/lib 
    66         cp -fpR $(STAGING_DIR)/usr/lib/libpopt.so.* $(IDIR_LIBPOPT)/usr/lib/ 
     64        cp -fpR $(PKG_BUILD_DIR)/.libs/libpopt.so.* $(IDIR_LIBPOPT)/usr/lib/ 
    6765        $(RSTRIP) $(IDIR_LIBPOPT) 
    68         mkdir -p $(PACKAGE_DIR) 
    6966        $(IPKG_BUILD) $(IDIR_LIBPOPT) $(PACKAGE_DIR) 
    7067 
Note: See TracChangeset for help on using the changeset viewer.