From 5941ccfbea49c2e67841a72a8baaec4f59a5001c Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Fri, 20 Jan 2006 12:10:28 +0000 Subject: [PATCH] fix xawtv install svn path=/nixpkgs/trunk/; revision=4580 --- .../video/xawtv/xawtv-3.95-makefile.patch | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/xawtv/xawtv-3.95-makefile.patch b/pkgs/applications/video/xawtv/xawtv-3.95-makefile.patch index a1d5589b535a..271bb4c7e5c0 100644 --- a/pkgs/applications/video/xawtv/xawtv-3.95-makefile.patch +++ b/pkgs/applications/video/xawtv/xawtv-3.95-makefile.patch @@ -1,14 +1,21 @@ diff -ruN xawtv-3.95/Makefile.in xawtv-3.95.new/Makefile.in --- xawtv-3.95/Makefile.in 2004-04-22 16:52:29.000000000 +0200 -+++ xawtv-3.95.new/Makefile.in 2006-01-04 00:15:04.000000000 +0100 -@@ -2,8 +2,8 @@ - VPATH := $(srcdir) ++++ xawtv-3.95.new/Makefile.in 2006-01-20 13:07:00.000000000 +0100 +@@ -3,7 +3,7 @@ # for package builds (buildroot install + no root privs needed) --DESTDIR= + DESTDIR= -SUID_ROOT=-m4755 -o root -+DESTDIR=$(out) +SUID_ROOT= # install paths prefix := @prefix@ +@@ -12,7 +12,7 @@ + mandir := $(DESTDIR)@mandir@ + libdir := $(DESTDIR)@libdir@/xawtv + datadir := $(DESTDIR)@datadir@/xawtv +-resdir := $(DESTDIR)@resdir@ ++resdir := $(out)@resdir@ + config := @x11conf@/xawtvrc + + # programs