summaryrefslogtreecommitdiffstats
path: root/pkg
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2009-11-25 16:15:50 +0000
committerjstebbins <[email protected]>2009-11-25 16:15:50 +0000
commit93fdbeb8b9f00382e38777d3e3dea12c05f325f7 (patch)
tree957bd91bb2906d2c5d7efe0a07c06b7c9ebc9d23 /pkg
parent8d07f8422dd290eabdb0d9d46e3227e6c10c7b3e (diff)
patch from konablend. bumps point rev to 5 and cleans up source tar creation
thanks kona! git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2976 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'pkg')
-rw-r--r--pkg/module.defs3
-rw-r--r--pkg/module.rules8
2 files changed, 6 insertions, 5 deletions
diff --git a/pkg/module.defs b/pkg/module.defs
index 97020d9f5..11dae99f7 100644
--- 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 7943873c2..f841fd93b 100644
--- 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
###############################################################################