summaryrefslogtreecommitdiff
path: root/x11/xvidcap/patches/patch-ae
blob: 431809ea9cb110cefd8cd2a6588349d7287f0780 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
$NetBSD: patch-ae,v 1.3 2006/05/17 05:06:28 reed Exp $

--- src/Makefile.in.orig	2004-02-14 12:06:20.000000000 -0800
+++ src/Makefile.in	2006-05-16 21:57:37.000000000 -0700
@@ -177,7 +177,7 @@
 
 AM_CFLAGS = @X_CFLAGS@ -DVERSION=\"@PACKAGE_VERSION@\"  $(am__append_1)
 
-AM_LDFLAGS = @X_LIBS@ -lpthread $(am__append_2) $(am__append_3)
+AM_LDFLAGS = @X_LIBS@ ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $(am__append_2) $(am__append_3)
 
 
 # specific xvidcap / gvidcap
@@ -195,14 +195,15 @@
 @WITHGTK2_TRUE@gvidcap_LDFLAGS = $(AM_LDFLAGS) `pkg-config --libs gtk+-2.0`
 @WITHGTK2_TRUE@@WITHGT_TRUE@gvidcap_LDADD = ../gt/libgt.a
 
-man1_MANS = ../man/xvidcap.man ../man/gvidcap.man
+@WITHGTK2_TRUE@man1_MANS = ../man/gvidcap.man
+@WITHGTK2_FALSE@man1_MANS = ../man/xvidcap.man
 
 EXTRA_DIST = mkresfile.sh
 subdir = src
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
-@WITHGTK2_TRUE@bin_PROGRAMS = xvidcap$(EXEEXT) gvidcap$(EXEEXT)
+@WITHGTK2_TRUE@bin_PROGRAMS =  gvidcap$(EXEEXT)
 @WITHGTK2_FALSE@bin_PROGRAMS = xvidcap$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS)
 
@@ -1800,10 +1801,12 @@
 	uninstall-info-am uninstall-man uninstall-man1
 
 
+@WITHGTK2_TRUE@docdir=${datadir}/doc/${PACKAGE_TARNAME}-gtk2-${PACKAGE_VERSION}
+@WITHGTK2_FALSE@docdir=${datadir}/doc/${PACKAGE_TARNAME}_${PACKAGE_VERSION}
 install-data-hook:
-	mkdir -p ${datadir}/doc/${PACKAGE_TARNAME}_${PACKAGE_VERSION}
-	./mkresfile.sh > XVidcap.ad && cp XVidcap.ad ${datadir}/doc/${PACKAGE_TARNAME}_${PACKAGE_VERSION}
-	cp ../README ../NEWS ../TODO ../INSTALL ../AUTHORS ../ChangeLog ${datadir}/doc/${PACKAGE_TARNAME}_${PACKAGE_VERSION}
+	mkdir -p ${docdir}
+	cp ../README ../NEWS ../TODO ../INSTALL ../AUTHORS ../ChangeLog ${docdir}
+@WITHGTK2_FALSE@	./mkresfile.sh > XVidcap.ad && cp XVidcap.ad ${datadir}/doc/${PACKAGE_TARNAME}_${PACKAGE_VERSION}
 
 uninstall-hook:
 	rm -rf ${datadir}/doc/${PACKAGE_TARNAME}_${PACKAGE_VERSION}