diff options
| author | jstebbins <[email protected]> | 2009-06-20 04:03:35 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2009-06-20 04:03:35 +0000 |
| commit | f1c2309090f2b764fc3cc9cf8bbce59721ba2dbd (patch) | |
| tree | 92f9f790b649c43620abc223b57d247fc8be4998 /pkg | |
| parent | ec55700a5b87ba7f954bb93675888923efa2aed8 (diff) | |
LinGui: packaging
- correct rpm architecture probing seems to need _target_cpu instead of
_build_arch
- correct creation of directories for package targets in module.rules
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2585 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/linux/module.defs | 2 | ||||
| -rw-r--r-- | pkg/linux/module.rules | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkg/linux/module.defs b/pkg/linux/module.defs index 1af0e0198..8b91f2d3d 100644 --- a/pkg/linux/module.defs +++ b/pkg/linux/module.defs @@ -1,5 +1,5 @@ PKG.deb.machine = `dpkg --print-architecture` -PKG.rpm.machine = `rpm -E "%_build_arch"` +PKG.rpm.machine = `rpm -E "%_target_cpu"` PKG.debian = $(PKG.in/)linux/debian PKG.cli.deb = $(PKG.out/)$(HB.name)-$(HB.version)-Ubuntu_CLI_$(BUILD.machine).deb PKG.gui.deb = $(PKG.out/)$(HB.name)-$(HB.version)-Ubuntu_GUI_$(BUILD.machine).deb diff --git a/pkg/linux/module.rules b/pkg/linux/module.rules index 676d7a749..aa1db0ed3 100644 --- a/pkg/linux/module.rules +++ b/pkg/linux/module.rules @@ -1,7 +1,7 @@ pkg.create.deb:: pkg.create $(PKG.gui.deb) $(PKG.cli.deb) pkg.create.rpm:: pkg.create $(PKG.gui.rpm) $(PKG.cli.rpm) -$(PKG.rpm): | $(dir $(PKG.rpm)) +$(PKG.gui.rpm) $(PKG.cli.rpm): | $(dir $(PKG.gui.rpm) $(PKG.cli.rpm)) $(PKG.gui.rpm) $(PKG.cli.rpm): -$(MKDIR.exe) -p $(RPM.out/)SOURCES -$(MKDIR.exe) -p $(RPM.out/)SPECS @@ -27,6 +27,7 @@ $(PKG.gui.deb): fakeroot $(MAKE) FORCEVERSION="-- -v$(HB.version)" BUILDDIR=$(BUILD) CONFIGURE=$(SRC/)configure PKGDESTDIR=$(PKG.out/) -f debian/rules binary $(MV.exe) $(PKG.gui.tmp.deb) $(PKG.gui.deb) +$(PKG.cli.deb): | $(dir $(PKG.cli.deb)) $(PKG.cli.deb): $(PKG.gui.deb) $(MV.exe) $(PKG.cli.tmp.deb) $(PKG.cli.deb) |