Package: frotz / 2.43-4

buildsystem.diff 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
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
frotz has a slightly odd buyild system, these changes allow using it with
debhelper

--- a/Makefile
+++ b/Makefile
@@ -1,30 +1,31 @@
 # Define your C compiler.  I recommend gcc if you have it.
 # MacOS users should use "cc" even though it's really "gcc".
 #
-CC = gcc
+#CC = gcc
 #CC = cc
 
 # Define your optimization flags.  Most compilers understand -O and -O2,
 # Standard (note: Solaris on UltraSparc using gcc 2.8.x might not like this.)
 #
-OPTS = -O2 
+OPTS = -O2 $(shell dpkg-buildflags --get CFLAGS)
 
 # Pentium with gcc 2.7.0 or better
 #OPTS = -O2 -fomit-frame-pointer -malign-functions=2 -malign-loops=2 \
 #-malign-jumps=2
 
 # Define where you want Frotz installed.  Usually this is /usr/local
-PREFIX = /usr/local
+PREFIX ?= /usr/local
 
-MAN_PREFIX = $(PREFIX)
-#MAN_PREFIX = /usr/local/share
+#BINDIR = $(PREFIX)/bin
+BINDIR ?= $(PREFIX)/games
 
-CONFIG_DIR = $(PREFIX)/etc
-#CONFIG_DIR = /etc
+MAN_PREFIX ?= $(PREFIX)/share
+#MAN_PREFIX = /usr/local/share
 
 # Define where you want Frotz to look for frotz.conf.
 #
-CONFIG_DIR = /usr/local/etc
+CONFIG_DIR ?= $(PREFIX)/etc
+#CONFIG_DIR = /usr/local/etc
 #CONFIG_DIR = /etc
 #CONFIG_DIR = /usr/pkg/etc
 #CONFIG_DIR =
@@ -32,7 +33,7 @@
 # Uncomment this if you want color support.  Most, but not all curses
 # libraries that work with Frotz will support color.
 #
-COLOR_DEFS = -DCOLOR_SUPPORT
+COLOR_DEFS ?= -DCOLOR_SUPPORT
 
 # Uncomment this if you have an OSS soundcard driver and want classical
 # Infocom sound support.
@@ -47,7 +48,7 @@
 # Define your sound device 
 # This should probably be a command-line/config-file option.
 #
-#SOUND_DEV = /dev/dsp
+SOUND_DEV = /dev/dsp
 #SOUND_DEV = /dev/sound
 #SOUND_DEV = /dev/audio
 
@@ -164,7 +165,7 @@
 
 $(NAME)-curses:		soundcard.h  $(COMMON_TARGET) $(CURSES_TARGET)
 	$(CC) -o $(BINNAME)$(EXTENSION) $(TARGETS) $(LIB) $(CURSES) \
-		$(SOUND_LIB)
+		$(SOUND_LIB) $(shell dpkg-buildflags --get LDFLAGS)
 
 all:	$(NAME) d$(NAME)
 
@@ -172,7 +173,7 @@
 d$(NAME):	$(NAME)-dumb
 $(NAME)-dumb:		$(COMMON_TARGET) $(DUMB_TARGET)
 	$(CC) -o d$(BINNAME)$(EXTENSION) $(COMMON_TARGET) \
-		$(DUMB_TARGET) $(LIB)
+		$(DUMB_TARGET) $(LIB) $(shell dpkg-buildflags --get LDFLAGS)
 
 .SUFFIXES:
 .SUFFIXES: .c .o .h
@@ -213,27 +214,29 @@
 	fi
 
 install: $(NAME)
-	strip $(BINNAME)$(EXTENSION)
-	install -d $(PREFIX)/bin
+	# in the debian build stripping is done at a later stage
+	#strip $(BINNAME)$(EXTENSION)
+	install -d $(BINDIR)
 	install -d $(MAN_PREFIX)/man/man6
-	install -c -m 755 $(BINNAME)$(EXTENSION) $(PREFIX)/bin
+	install -c -m 755 $(BINNAME)$(EXTENSION) $(BINDIR)
 	install -c -m 644 doc/$(NAME).6 $(MAN_PREFIX)/man/man6
 
 uninstall:
-	rm -f $(PREFIX)/bin/$(NAME)
+	rm -f $(BINDIR)/$(NAME)
 	rm -f $(MAN_PREFIX)/man/man6/$(NAME).6
 
 deinstall: uninstall
 
 install_dumb: d$(NAME)
-	strip d$(BINNAME)$(EXTENSION)
-	install -d $(PREFIX)/bin
+	# in the debian build stripping is done at a later stage
+	#strip d$(BINNAME)$(EXTENSION)
+	install -d $(BINDIR)
 	install -d $(MAN_PREFIX)/man/man6
-	install -c -m 755 d$(BINNAME)$(EXTENSION) $(PREFIX)/bin
+	install -c -m 755 d$(BINNAME)$(EXTENSION) $(BINDIR)
 	install -c -m 644 doc/d$(NAME).6 $(MAN_PREFIX)/man/man6
 
 uninstall_dumb:
-	rm -f $(PREFIX)/bin/d$(NAME)
+	rm -f $(BINDIR)/d$(NAME)
 	rm -f $(MAN_PREFIX)/man/man6/d$(NAME).6
 
 deinstall_dumb: uninstall_dumb