summaryrefslogtreecommitdiff
path: root/graphics/hp2xx/patches/patch-ab
blob: 4db7686c0cb3a24c55294fa2f43e52d6e07132c7 (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
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
$NetBSD: patch-ab,v 1.6 2002/02/18 15:14:21 seb Exp $

--- Makefile.orig	Fri Feb 15 14:23:08 2002
+++ Makefile
@@ -28,13 +28,13 @@
 
 CHMOD    = chmod
 CP       = cp
-MKINFO   = makeinfo
+MKINFO   = $(MAKEINFO)
 RMCMD    = rm -f
 STRIP    = strip
 
 # Installation sites (GNU conventions):
 #
-prefix   = /usr/local
+prefix   = ${PREFIX}
 bindir   = $(prefix)/bin
 includedir = $(prefix)/include
 mandir   = $(prefix)/man
@@ -44,12 +44,12 @@
 # CC and CFLAGS set for gcc, but any ANSI-C compiler should work.
 # For non-gcc compilers, simply set CFLAGS = -O (to start with)
 #
-CC       = gcc
-CFLAGS   = -O2 -Wall -ansi -fstrength-reduce -finline-functions
+#CC       = gcc
+CFLAGS+=  -Wall -ansi -fstrength-reduce -finline-functions
 
-LFLAGS   =                # only sometimes needed; see below for examples
-CPPFLAGS = -I.            # only sometimes needed; see below for examples
-BINDCMD  =                # only needed for EMX and DJGPP DOS extenders
+LFLAGS   = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib  -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib # only sometimes needed; see below for examples
+CPPFLAGS = -I. -I${X11BASE}/include  -I${LOCALBASE}/include # only sometimes needed; see below for examples
+BINDCMD  = echo               # only needed for EMX and DJGPP DOS extenders
 
 
 
@@ -62,7 +62,7 @@
 #
 DEFINES   = -DUNIX -DHAS_UNIX_X11
 PREVIEWER = to_x11
-ALL_LIBS  = -lX11 -lm     #  Maybe -lX instead of -lX11 is needed?
+ALL_LIBS  = -lX11 -lm -lz -lpng -ltiff -ljpeg
 #
 # Generic UNIX, no previewer
 #
@@ -182,14 +182,14 @@
 EX_DEFS	=
 #
 # PNG support (requires -lpng and -lz on the ALL_LIBS line)
-#EX_SRC	= png.c to_png.c
-#EX_OBJ	= png.o to_png.o 
-#EX_DEFS= -DPNG
+EX_SRC+= png.c to_png.c
+EX_OBJ+= png.o to_png.o 
+EX_DEFS+= -DPNG
 #
 # TIFF support (requires -ltiff and possibly -lz on the ALL_LIBS line)
-#EX_SRC	= to_tif.c
-#EX_OBJ	= to_tif.o
-#EX_DEFS	= -DTIF
+EX_SRC+= to_tif.c
+EX_OBJ+= to_tif.o
+EX_DEFS+= -DTIF
 #
 # Include extras:
 # EX_SRC	= to_pic.c to_pac.c
@@ -305,15 +305,11 @@
 install:	install-bin install-info install-man
 
 install-bin:	$(PROGRAM)
-		-$(STRIP) $(PROGRAM)
-		$(CP) $(PROGRAM) $(bindir)
-		$(CHMOD) 755 $(bindir)/$(PROGRAM)
+		${BSD_INSTALL_PROGRAM} $(PROGRAM) $(bindir)
 
 install-info:	hp2xx.info
-		$(CP) hp2xx.info $(infodir)
-		$(CHMOD) 644 $(infodir)/hp2xx.info
+		${BSD_INSTALL_MAN} hp2xx.info $(infodir)
 
 install-man:	../doc/hp2xx.1
-		$(CP) ../doc/hp2xx.1 $(man1dir)
-		$(CHMOD) 644 $(man1dir)/hp2xx.1
+		${BSD_INSTALL_MAN} ../doc/hp2xx.1 $(man1dir)