Changeset 6a3a83a in freewrt for tools/lzma

Timestamp:

Jul 21, 2006, 2:51:53 AM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

509a849

Parents:

a3040af

Message:

do the rename action here too and sync the download case ;)

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@314 afb5a338-a214-0410-bd46-81f09a774fd1

File:

• tools/lzma/Makefile (modified) (3 diffs)

tools/lzma/Makefile

@@ -9 +9 @@
 PKG_SOURCE_URL:=        @SF/sevenzip
 PKG_SOURCE:=            $(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR:=         $(TOOLS_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
-LZMA_LIB_DIR=           $(PKG_BUILD_DIR)/C/7zip/Compress/LZMA_Lib
-LZMA_ALONE_DIR=         $(PKG_BUILD_DIR)/C/7zip/Compress/LZMA_Alone
+LZMA_LIB_DIR=           $(WRKBUILD)/C/7zip/Compress/LZMA_Lib
+LZMA_ALONE_DIR=         $(WRKBUILD)/C/7zip/Compress/LZMA_Alone
 
 TARGETS=                $(LZMA_LIB_DIR)/liblzma.a $(LZMA_ALONE_DIR)/lzma
 
-$(DL_DIR)/$(PKG_SOURCE):
-        $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL) $(MAKE_TRACE)
-
-$(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE) 
+$(WRKBUILD)/.unpacked: $(DL_DIR)/$(PKG_SOURCE) 
         ${EXTRACT_CMD}
-        $(PATCH) $(PKG_BUILD_DIR) patches/ \*.patch
+        $(PATCH) $(WRKBUILD) patches/ \*.patch
         touch $@
         
-$(LZMA_ALONE_DIR)/lzma $(LZMA_LIB_DIR)/liblzma.a: $(PKG_BUILD_DIR)/.built
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.unpacked
+$(LZMA_ALONE_DIR)/lzma $(LZMA_LIB_DIR)/liblzma.a: $(WRKBUILD)/.built
+$(WRKBUILD)/.built: $(WRKBUILD)/.unpacked
         $(MAKE) -C $(LZMA_LIB_DIR) $(MAKE_TRACE)
         $(MAKE) -f makefile.gcc -C $(LZMA_ALONE_DIR) $(MAKE_TRACE)
@@ -31 +27 @@
 
 lzma: $(TARGETS)
-        $(CP) $^ $(PKG_BUILD_DIR)
+        $(CP) $^ $(WRKBUILD)
 
 lzma-source: $(DL_DIR)/$(PKG_SOURCE)
@@ -38 +34 @@
         -$(MAKE) -C $(LZMA_LIB_DIR) clean $(MAKE_TRACE)
         -$(MAKE) -C $(LZMA_ALONE_DIR) clean $(MAKE_TRACE)
-        rm -f $(PKG_BUILD_DIR)/liblzma.a $(PKG_BUILD_DIR)/lzma
+        rm -f $(WRKBUILD)/liblzma.a $(WRKBUILD)/lzma
 
 lzma-dirclean:
-        rm -rf $(PKG_BUILD_DIR)
+        rm -rf $(WRKBUILD)
 
 #############################################################
 
-prepare: $(PKG_BUILD_DIR)/.unpacked
+prepare: $(WRKBUILD)/.unpacked
 compile: lzma
 install: lzma
-        $(CP) $(PKG_BUILD_DIR)/lzma $(STAGING_DIR)/bin/
+        $(CP) $(WRKBUILD)/lzma $(STAGING_DIR)/bin/
 clean: lzma-dirclean