summaryrefslogtreecommitdiff
path: root/mbone/vat/patches/patch-ak
blob: cfc01c11949b7bedcf129b7320ecb0716b27c858 (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
48
49
50
51
52
53
54
55
56
57
58
$NetBSD: patch-ak,v 1.4 2014/02/04 00:17:35 joerg Exp $

--- Makefile.in.orig	1996-04-25 13:20:32.000000000 +0000
+++ Makefile.in
@@ -48,6 +48,7 @@ CC = @CC@
 C++ = @CXX@
 TABCC = @V_TABCC@
 CCOPT = @V_CCOPT@
+CPPFLAGS= @CPPFLAGS@
 
 INCLUDE_TK = @V_INCLUDE_TK@
 INCLUDE_TCL = @V_INCLUDE_TCL@
@@ -85,7 +86,7 @@ SRC_AUDIO = $(OBJ_AUDIO:.o=.cc) 
 LIB = $(LIB_AUDIO) @V_LIB_TK@ @V_LIB_TCL@ @V_LIB_GSM@ @V_LIB_X11@ @V_LIB@ -lm
 INCLUDE = $(INCLUDE_MISC) $(INCLUDE_AUDIO) $(INCLUDE_TK) $(INCLUDE_TCL) \
 	$(INCLUDE_X11) $(MD_INC)
-DEFINE = @V_DEFINE@ -DSIGRET=@V_SIGRET@ -DFRAMESIZE=160
+DEFINE = @V_DEFINE@ -DSIGRET=@V_SIGRET@ -DFRAMESIZE=160 -DUSE_INTERP_RESULT
 BFLAGS = $(DEFINE) $(INCLUDE)
 CFLAGS = $(CCOPT) $(BFLAGS)
 
@@ -175,7 +176,7 @@ $(OBJ3): $(SRC3)
 	$(TABCC) $(RFLAG) -c $*.c
 
 $(SRC3): mktab.c
-	$(CC) $(CFLAGS) -o mktab mktab.c $(LIB) $(STATIC)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o mktab mktab.c $(LIB) $(STATIC)
 	rm -f $(SRC3)
 	./mktab -mulaw > tabmulaw.c
 	./mktab -sum > tabmix.c
@@ -184,7 +185,7 @@ $(SRC3): mktab.c
 	rm -f mktab
 
 vat-gsm.o: vat-gsm.c
-	rm -f $@; $(CC) -o $@ -c $(INCLUDE_GSM) $(CFLAGS) $*.c
+	rm -f $@; $(CC) -o $@ -c $(CPPFLAGS) $(CFLAGS) $*.c
 
 tar: force
 	tar=vatbin-`cat VERSION`-@V_TAR_TARGET@.tar.gz ; \
@@ -209,16 +210,10 @@ srctar: force
 	     rm ../$$name; chmod 444 $$tar
 
 install: force
-	 cp vat @prefix@/bin/vat; \
-	 chown bin @prefix@/bin/vat; \
-	 chgrp bin @prefix@/bin/vat; \
-	 chmod 555 @prefix@/bin/vat
+	${BSD_INSTALL_PROGRAM} vat ${DESTDIR}@prefix@/bin
 
 install-man: force
-	cp vat.1 @prefix@/man/man1/vat.1
-	chown bin @prefix@/man/man1/vat.1
-	chgrp bin @prefix@/man/man1/vat.1
-	chmod 444 @prefix@/man/man1/vat.1
+	${BSD_INSTALL_MAN} vat.1 ${DESTDIR}@prefix@/man/man1
 
 CLEAN = vat core core.vat tcl2c++ config.log config.cache
 clean: