summaryrefslogtreecommitdiff
path: root/cad/chipmunk/files/patch-au
blob: d4c76f810dd92dd0e94d02e087d9c3d39e6327e8 (plain) (blame)
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
59
60
61
--- view/Makefile.orig	2011-10-21 07:29:27.000000000 +0900
+++ view/Makefile	2011-11-26 22:47:47.000000000 +0900
@@ -45,7 +45,7 @@
 ## For most versions of UNIX, one of the above directories
 ## will be the correct one to use on the line below:
 
-XINCLUDEDIR = .
+XINCLUDEDIR = ${LOCALBASE}/include
 
 
 ## 
@@ -71,7 +71,7 @@
 ## LIBX11= -lX11 -s
 ##
 
-LIBX11 = -lX11
+LIBX11 = -lX11 -L${LOCALBASE}/lib
 
 LIBP2C = ../psys/src/libp2c.a
 
@@ -83,7 +83,7 @@
 ##
 ## on Sun Solaris 2.X, -lsocket -lnsl must be added to OTHERLIBS
 
-OTHERLIBS= -lm  
+OTHERLIBS= -lm -lcompat
 
 ##
 ## (2) IEEE library directory
@@ -128,7 +128,7 @@
 
 CHIPMUNKCC = gcc -O3
 
-CC = $(CHIPMUNKCC) 
+CC ?= $(CHIPMUNKCC) 
 
 ##
 ## (4) Adding appropriate flags
@@ -173,11 +173,11 @@
 
 CHIPMUNKFLAGS = 
 
-CFLAGS= $(CHIPMUNKFLAGS) -I$(LOCINC) -I$(XINCLUDEDIR) -DF_OK=0
+CFLAGS += -I$(LOCINC) -I$(XINCLUDEDIR) -DF_OK=0
 
 LDFLAGS= $(LIBP2C) $(LIBX11) $(OTHERLIBS) 
 MYLDFLAGS= $(LIBP2C)  $(IEEEDIR) $(LIBX11)  $(OTHERLIBS)
-BINDIR= ../bin
+BINDIR = ${PREFIX}/bin
 
 OBJS =			\
 	viewfit.o	\
@@ -245,7 +245,7 @@
 	(chdir mt;	make; chdir ..; chdir tek2430; make; chdir ..; make mtlink)
 
 install: view
-	cp view $(BINDIR)/vc
+	${BSD_INSTALL_PROGRAM} view $(BINDIR)/vc
 
 myinstall: myview
 	cp view ../bin/myview