diff --git a/openwrt/package/microperl/Makefile b/openwrt/package/microperl/Makefile index 8118c8d4ea..3cf92d9b2b 100644 --- a/openwrt/package/microperl/Makefile +++ b/openwrt/package/microperl/Makefile @@ -12,33 +12,21 @@ PKG_SOURCE_URL:=ftp://ftp.cpan.org/pub/CPAN/src/5.0 \ ftp://ftp.gmd.de/mirrors/CPAN/src/5.0 \ ftp://ftp.funet.fi/pub/languages/perl/CPAN/src/5.0 PKG_SOURCE:=perl-$(PKG_VERSION).tar.gz -PKG_BUILD_DIR:=$(BUILD_DIR)/perl-$(PKG_VERSION) PKG_CAT:=zcat -PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk -PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg -$(DL_DIR)/$(PKG_SOURCE): - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL) +PKG_BUILD_DIR:=$(BUILD_DIR)/perl-$(PKG_VERSION) -$(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE) - $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - touch $(PKG_BUILD_DIR)/.unpacked +include $(TOPDIR)/package/rules.mk -$(PKG_BUILD_DIR)/$(PKG_NAME): $(PKG_BUILD_DIR)/.unpacked - $(MAKE) -f Makefile.micro CC="$(TARGET_CC)" OPTIMIZE="$(TARGET_CFLAGS)" -C $(PKG_BUILD_DIR) +$(eval $(call PKG_template,MICROPERL,microperl,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(PKG_IPK): $(PKG_BUILD_DIR)/$(PKG_NAME) - $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) - mkdir -p $(PKG_IPK_DIR)/usr/bin - cp $(PKG_BUILD_DIR)/$(PKG_NAME) $(PKG_IPK_DIR)/usr/bin/ - $(STRIP) $(PKG_IPK_DIR)/usr/bin/* - mkdir -p $(PACKAGE_DIR) - $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR) +$(PKG_BUILD_DIR)/.built: + $(MAKE) -C $(PKG_BUILD_DIR) -f Makefile.micro \ + CC="$(TARGET_CC)" OPTIMIZE="$(TARGET_CFLAGS)" + touch $(PKG_BUILD_DIR)/.built -source: $(DL_DIR)/$(PKG_SOURCE) -prepare: $(PKG_BUILD_DIR)/.unpacked -compile: $(PKG_IPK) -install: - $(IPKG) install $(PKG_IPK) -clean: - rm -rf $(PKG_BUILD_DIR) +$(IPKG_MICROPERL): + install -d -m0755 $(IDIR_MICROPERL)/usr/bin + install -m0755 $(PKG_BUILD_DIR)/microperl $(IDIR_MICROPERL)/usr/bin/ + $(RSTRIP) $(IDIR_MICROPERL) + $(IPKG_BUILD) $(IDIR_MICROPERL) $(PACKAGE_DIR) diff --git a/openwrt/package/microperl/microperl.control b/openwrt/package/microperl/ipkg/microperl.control similarity index 100% rename from openwrt/package/microperl/microperl.control rename to openwrt/package/microperl/ipkg/microperl.control