patch from konablend. bumps point rev to 5 and cleans up source tar creation

thanks kona!

git-svn-id: svn://localhost/HandBrake/trunk@2976 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/make/configure.py b/make/configure.py
index a12d380..628a97a 100644 (file)
--- a/make/configure.py
+++ b/make/configure.py
@@ -660,7 +660,7 @@ class Project( Action ):
 
         self.vmajor = 0
         self.vminor = 9
-        self.vpoint = 4
+        self.vpoint = 5
 
     def _action( self ):
         ## add architecture to URL only for Mac

diff --git a/pkg/module.defs b/pkg/module.defs
index 97020d9..11dae99 100644 (file)
--- a/pkg/module.defs
+++ b/pkg/module.defs
@@ -3,7 +3,8 @@ $(eval $(call import.MODULE.defs,PKG,pkg))
 PKG.in/  = $(SRC/)pkg/
 PKG.out/ = $(BUILD/)pkg/
 
-PKG.src.tar.bz2 = $(PKG.out/)$(HB.name)-$(HB.version).tar.bz2
+PKG.basename    = $(HB.name)-$(HB.version)
+PKG.src.tar.bz2 = $(PKG.out/)$(PKG.basename).tar.bz2
 
 STAGE.out/     = $(BUILD/)stage/
 STAGE.out.src/ = $(STAGE.out/)src/

diff --git a/pkg/module.rules b/pkg/module.rules
index 7943873..f841fd9 100644 (file)
--- a/pkg/module.rules
+++ b/pkg/module.rules
@@ -12,13 +12,13 @@ pkg.clean:
 
 $(PKG.src.tar.bz2): | $(dir $(PKG.src.tar.bz2))
 $(PKG.src.tar.bz2): | $(STAGE.out.src/)
-       $(TAR.exe) cjf $@ -C $(STAGE.out.src/) $(HB.name)-$(HB.version)
+       $(TAR.exe) cjf $@ -C $(STAGE.out.src/) $(PKG.basename)
 
 $(STAGE.out.src/):
-       svn export -r$(HB.repo.rev) $(HB.repo.url) $@/$(HB.name)-$(HB.version)
+       svn export -r$(HB.repo.rev) $(HB.repo.url) $@/$(PKG.basename)
        sed 's/\(self.rev.*=.*\)0/\1$(HB.repo.rev)/' \
-           $@/$(HB.name)-$(HB.version)/make/configure.py > $@/$(HB.name)-$(HB.version)/make/configure.py.tmp
-       $(MV.exe) $@/$(HB.name)-$(HB.version)/make/configure.py.tmp $@/$(HB.name)-$(HB.version)/make/configure.py
+           $@/$(PKG.basename)/make/configure.py > $@/$(PKG.basename)/make/configure.py.tmp
+       $(MV.exe) $@/$(PKG.basename)/make/configure.py.tmp $@/$(PKG.basename)/make/configure.py
 
 ###############################################################################