| 1 | diff -u -r ../frotz-2.43d/Makefile ./Makefile |
| 2 | --- ../frotz-2.43d/Makefile 2012-01-03 09:32:58.000000000 +0100 |
| 3 | +++ ./Makefile 2014-03-06 22:50:06.580642826 +0100 |
| 4 | @@ -1,22 +1,22 @@ |
| 5 | # Define your C compiler. I recommend gcc if you have it. |
| 6 | # MacOS users should use "cc" even though it's really "gcc". |
| 7 | # |
| 8 | -CC = gcc |
| 9 | +#CC = gcc |
| 10 | #CC = cc |
| 11 | |
| 12 | # Define your optimization flags. Most compilers understand -O and -O2, |
| 13 | # Standard (note: Solaris on UltraSparc using gcc 2.8.x might not like this.) |
| 14 | # |
| 15 | -OPTS = -O2 |
| 16 | +OPTS = -Os |
| 17 | |
| 18 | # Pentium with gcc 2.7.0 or better |
| 19 | #OPTS = -O2 -fomit-frame-pointer -malign-functions=2 -malign-loops=2 \ |
| 20 | #-malign-jumps=2 |
| 21 | |
| 22 | # Define where you want Frotz installed. Usually this is /usr/local |
| 23 | -PREFIX = /usr/local |
| 24 | +#PREFIX = /usr/local |
| 25 | |
| 26 | -MAN_PREFIX = $(PREFIX) |
| 27 | +MAN_PREFIX = $(PREFIX)/share |
| 28 | #MAN_PREFIX = /usr/local/share |
| 29 | |
| 30 | CONFIG_DIR = $(PREFIX)/etc |
| 31 | @@ -24,7 +24,7 @@ |
| 32 | |
| 33 | # Define where you want Frotz to look for frotz.conf. |
| 34 | # |
| 35 | -CONFIG_DIR = /usr/local/etc |
| 36 | +#CONFIG_DIR = /usr/local/etc |
| 37 | #CONFIG_DIR = /etc |
| 38 | #CONFIG_DIR = /usr/pkg/etc |
| 39 | #CONFIG_DIR = |
| 40 | @@ -73,8 +73,8 @@ |
| 41 | # curses library won't work, comment out the first option and uncomment |
| 42 | # the second. |
| 43 | # |
| 44 | -CURSES = -lcurses |
| 45 | -#CURSES = -lncurses |
| 46 | +#CURSES = -lcurses |
| 47 | +CURSES = -lncurses |
| 48 | |
| 49 | # Uncomment this if your need to use ncurses instead of the |
| 50 | # vendor-supplied curses library. This just tells the compile process |
| 51 | @@ -187,24 +187,24 @@ |
| 52 | $(COMMON_TARGET): $(COMMON_OBJECT) |
| 53 | @echo |
| 54 | @echo "Archiving common code..." |
| 55 | - ar rc $(COMMON_TARGET) $(COMMON_OBJECT) |
| 56 | - ranlib $(COMMON_TARGET) |
| 57 | + $(AR) rc $(COMMON_TARGET) $(COMMON_OBJECT) |
| 58 | + $(RANLIB) $(COMMON_TARGET) |
| 59 | @echo |
| 60 | |
| 61 | curses_lib: config_curses $(CURSES_TARGET) |
| 62 | $(CURSES_TARGET): $(CURSES_OBJECT) |
| 63 | @echo |
| 64 | @echo "Archiving curses interface code..." |
| 65 | - ar rc $(CURSES_TARGET) $(CURSES_OBJECT) |
| 66 | - ranlib $(CURSES_TARGET) |
| 67 | + $(AR) rc $(CURSES_TARGET) $(CURSES_OBJECT) |
| 68 | + $(RANLIB) $(CURSES_TARGET) |
| 69 | @echo |
| 70 | |
| 71 | dumb_lib: $(DUMB_TARGET) |
| 72 | $(DUMB_TARGET): $(DUMB_OBJECT) |
| 73 | @echo |
| 74 | @echo "Archiving dumb interface code..." |
| 75 | - ar rc $(DUMB_TARGET) $(DUMB_OBJECT) |
| 76 | - ranlib $(DUMB_TARGET) |
| 77 | + $(AR) rc $(DUMB_TARGET) $(DUMB_OBJECT) |
| 78 | + $(RANLIB) $(DUMB_TARGET) |
| 79 | @echo |
| 80 | |
| 81 | soundcard.h: |
| 82 | @@ -213,7 +213,7 @@ |
| 83 | fi |
| 84 | |
| 85 | install: $(NAME) |
| 86 | - strip $(BINNAME)$(EXTENSION) |
| 87 | + $(STRIP) $(BINNAME)$(EXTENSION) |
| 88 | install -d $(PREFIX)/bin |
| 89 | install -d $(MAN_PREFIX)/man/man6 |
| 90 | install -c -m 755 $(BINNAME)$(EXTENSION) $(PREFIX)/bin |
| 91 | @@ -226,7 +226,7 @@ |
| 92 | deinstall: uninstall |
| 93 | |
| 94 | install_dumb: d$(NAME) |
| 95 | - strip d$(BINNAME)$(EXTENSION) |
| 96 | + $(STRIP) d$(BINNAME)$(EXTENSION) |
| 97 | install -d $(PREFIX)/bin |
| 98 | install -d $(MAN_PREFIX)/man/man6 |
| 99 | install -c -m 755 d$(BINNAME)$(EXTENSION) $(PREFIX)/bin |