Package: vtprint / 2.0.2-13

10_fix-building.patch Patch series | download
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
Description: Fix Makefile so vtprint builds properly in Debian
 incorporate DESTDIR
 use FHS standard paths
 adjust options to groff
 fix handling of CFLAGS and LDFLAGS
Author: Joe Nahmias <jello@debian.org>
Bug-Debian: http://bugs.debian.org/438249
Last-Update: 2013-06-27
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- vtprint-2.0.2.orig/Makefile
+++ vtprint-2.0.2/Makefile
@@ -37,7 +37,7 @@
 # Compiler & compile flags
 
 CC			 = gcc
-COMPILE_OPTS = -O -g
+#COMPILE_OPTS = -O -g
 LINK_OPTS	 =
 
 # Default device name
@@ -46,7 +46,8 @@
 
 # Library file (vtprintcap)
 
-LIBFILE		= /usr/local/lib/vtprint/vtprintcap
+#LIBFILE		= /usr/local/lib/vtprint/vtprintcap
+LIBFILE	= /etc/vtprintcap
 
 # Termcap location (man page reference)
 
@@ -64,10 +65,10 @@
 
 # System installation directories
 
-MAN1_DIR	= /usr/local/man/man$(MAN1_SECT)
-MAN5_DIR	= /usr/local/man/man$(MAN5_SECT)
-BIN_DIR		= /usr/local/bin
-LIB_DIR		= /usr/local/lib/vtprint
+MAN1_DIR	= $(DESTDIR)/usr/share/man/man$(MAN1_SECT)
+MAN5_DIR	= $(DESTDIR)/usr/share/man/man$(MAN5_SECT)
+BIN_DIR		= $(DESTDIR)/usr/bin
+LIB_DIR		= $(DESTDIR)/etc
 
 
 # User directories (for "make userinstall")
@@ -98,7 +99,7 @@
 VER_MO	= October
 VER_DY 	= 25
 VER_YR	= 1994
-VERSION_DT = $(VER_MO)\ $(VER_DY)\,\ $(VER_YR)
+VERSION_DT = $(VER_MO)-$(VER_DY)-$(VER_YR)
 
 # Consolidated defines
 
@@ -107,8 +108,8 @@
 
 # Compiler options & flags 
 
-CFLAGS	=	$(DEFINES) $(COMPILE_OPTS)
-LDFLAGS	=	$(LINK_OPTS)
+CFLAGS	+=	$(DEFINES) $(COMPILE_OPTS)
+LDFLAGS	+=	$(LINK_OPTS)
 
 TARGET	=	vtprint
 OBJS	= \
@@ -150,16 +151,16 @@
 
 man: vtprint.man vtprint.ps vtprintcap.man vtprintcap.ps\
   vtprtoff.man vtprtoff.ps
-	echo Are You a god?  Don't forget to make woman also!
+	echo "Are You a god?  Don't forget to make woman also!"
 
 woman:
 	echo ... just to be politically correct, I suppose??
 
 FAQ: FAQ.ms FAQ.macros
-	groff -Tascii -mgs FAQ.ms > FAQ
+	groff -Tascii -ms FAQ.ms > FAQ
 
 FAQ.ps: FAQ.ms FAQ.macros
-	groff -Tps -mgs FAQ.ms > FAQ.ps
+	groff -Tps -ms FAQ.ms > FAQ.ps
 
 install.man:
 	./install -d -m 755 $(MAN1_DIR)