diff options
| author | jstebbins <[email protected]> | 2009-08-24 17:32:22 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2009-08-24 17:32:22 +0000 |
| commit | 2752e26db58d8304e3ddb03a9b95c4f9af7bf5fa (patch) | |
| tree | 20bcb6484190356bc65bd0448cd4ca3f7f36ba80 /pkg | |
| parent | 9e43a26a870845acafbeff92f62db3609c48e37c (diff) | |
build system: some changes that simplify things for packaging tools
- Add DESTDIR to install path for HandBrakeCLI
- Modify linux packaging rules for deb and rpm packages to use DESTDIR
- lingui: only update icon cache during install if DESTDIR is not set
- patch out the hardcoded install path for m4 macros in libdvdread and libdvdnav
when uid==0
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2774 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'pkg')
| -rwxr-xr-x | pkg/linux/debian/rules | 2 | ||||
| -rw-r--r-- | pkg/linux/module.rules | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/pkg/linux/debian/rules b/pkg/linux/debian/rules index a30f4fb1d..4ce0ec08d 100755 --- a/pkg/linux/debian/rules +++ b/pkg/linux/debian/rules @@ -43,7 +43,7 @@ install: build dh_testdir dh_testroot dh_installdirs - $(MAKE) -C $(BUILDDIR) PREFIX=$(CURDIR)/debian/tmp/usr PREFIX/=$(CURDIR)/debian/tmp/usr/ install + $(MAKE) -C $(BUILDDIR) DESTDIR=$(CURDIR)/debian/tmp install # Build architecture-independent files here. binary-indep: build install diff --git a/pkg/linux/module.rules b/pkg/linux/module.rules index 2d5b1a223..c3346be5b 100644 --- a/pkg/linux/module.rules +++ b/pkg/linux/module.rules @@ -12,7 +12,6 @@ $(PKG.gui.rpm) $(PKG.cli.rpm): $(CP.exe) $(GTK.src/)ghb.spec $(RPM.out/)SPECS $(CP.exe) $(PKG.src.tar.bz2) $(RPM.out/)SOURCES $(TAR.exe) -xf $(PKG.src.tar.bz2) -C $(RPM.out/)BUILD -# fakeroot $(MAKE) PREFIX=$(RPMROOT.out/)usr PREFIX/=$(RPMROOT.out/)usr/ install rpmbuild --define="version $(HB.version)" --define="_topdir $(PWD)/$(RPM.out)" --buildroot $(RPMROOT.out) -ba $(GTK.src/)ghb.spec $(CP.exe) $(RPM.out/)RPMS/$(PKG.rpm.machine)/$(HB.name)-cli-$(HB.version)*.rpm $(PKG.cli.rpm) $(CP.exe) $(RPM.out/)RPMS/$(PKG.rpm.machine)/$(HB.name)-gui-$(HB.version)*.rpm $(PKG.gui.rpm) |