summary refs log tree commit diff
path: root/pkgs/applications/video/xawtv
diff options
context:
space:
mode:
authorArmijn Hemel <armijn@gpl-violations.org>2006-01-20 12:10:28 +0000
committerArmijn Hemel <armijn@gpl-violations.org>2006-01-20 12:10:28 +0000
commit5941ccfbea49c2e67841a72a8baaec4f59a5001c (patch)
treefaa0e1ce8faf8eb0e2f8e5f220d3386cb88fb314 /pkgs/applications/video/xawtv
parent3e9727a48d863a0eaf5dd0a0711e305f343f2035 (diff)
fix xawtv install
svn path=/nixpkgs/trunk/; revision=4580
Diffstat (limited to 'pkgs/applications/video/xawtv')
-rw-r--r--pkgs/applications/video/xawtv/xawtv-3.95-makefile.patch17
1 files 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 a1d5589b535ad..271bb4c7e5c0d 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