diff options
author | jstebbins <[email protected]> | 2009-06-20 03:07:57 +0000 |
---|---|---|
committer | jstebbins <[email protected]> | 2009-06-20 03:07:57 +0000 |
commit | 27b9c72a0a2d2f426c74f1dec858595dd64fc3c7 (patch) | |
tree | 05d2475134716f1f9d1a2bad3d266bdd7acb2281 /pkg/linux/module.defs | |
parent | 989cb1d9fbc7faab456c317d03a9a3b8d68b00f7 (diff) |
LinGui: add RPM packaging support and modify Debian so they can co-exist
- make pkg.create.rpm will create rpm packages
- make pkg.create.deb will create debian packages
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2583 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'pkg/linux/module.defs')
-rw-r--r-- | pkg/linux/module.defs | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/pkg/linux/module.defs b/pkg/linux/module.defs index 7606aed7e..1af0e0198 100644 --- a/pkg/linux/module.defs +++ b/pkg/linux/module.defs @@ -1,4 +1,5 @@ PKG.deb.machine = `dpkg --print-architecture` +PKG.rpm.machine = `rpm -E "%_build_arch"` 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 @@ -6,7 +7,16 @@ PKG.gui.deb = $(PKG.out/)$(HB.name)-$(HB.version)-Ubuntu_GUI_$(BUILD.machine).de PKG.cli.tmp.deb = $(PKG.out/)handbrake-cli_$(HB.version)_$(PKG.deb.machine).deb PKG.gui.tmp.deb = $(PKG.out/)handbrake-gtk_$(HB.version)_$(PKG.deb.machine).deb +PKG.cli.rpm = $(PKG.out/)$(HB.name)-$(HB.version)-Fedora_CLI_$(BUILD.machine).rpm +PKG.gui.rpm = $(PKG.out/)$(HB.name)-$(HB.version)-Fedora_GUI_$(BUILD.machine).rpm +RPM.out = $(STAGE.out/)rpm +RPM.out/ = $(STAGE.out/)rpm/ +RPMROOT.out = $(PWD)/$(STAGE.out/)rpmroot +RPMROOT.out/ = $(PWD)/$(STAGE.out/)rpmroot/ + ############################################################################### BUILD.out += $(PKG.cli.deb) BUILD.out += $(PKG.gui.deb) +BUILD.out += $(PKG.cli.rpm) +BUILD.out += $(PKG.gui.rpm) |