1--- Imakefile.orig	1995-07-21 07:32:07.000000000 -0700
2+++ Imakefile	2015-10-25 01:02:38.165861182 -0700
3@@ -1,29 +1,29 @@
4-/**/# Based on an Imakefile from:
5-/**/# Andreas Stolcke
6-/**/# International Computer Science Institute, Berkeley.
7-/**/# With help from:
8-/**/# George Lindholm, Jonathan I. Kamens, Braham Levy.
9-
10-
11-/**/# o Define FORKRETURNSSHORT/FORKRETURNSLONG/FORKRETURNSPID_T if your
12-/**/#   fork(2) returns short/long/pid_t not int.
13-/**/# o Define USEFLOCK or USELOCKF to use flock(2) or lockf(3) to lock files,
14-/**/#   rather than fcntl(2).
15-/**/# o Define USELSEEK to use lseek(2) to move to the end of the file, rather
16-/**/#   than fseek(3).
17-/**/# o Define USERENAME to use rename(2) to rename file names (otherwise
18-/**/#   un/link(2)).
19-/**/# o Define USEGETHOSTNAME or USEUNAME (or neither if you don't have
20-/**/#   gethostname(2) or uname(2)) to get the name of your system.
21-/**/# o Define USEGETPWUID to use getpwuid(3) and getuid(2) to get the user
22-/**/#   name and home directory on your system.  Note that if you want to use
23-/**/#   this method to get the user's home directory, but another method to get
24-/**/#   the user name, this symbol must still be defined.
25-/**/# o Define USEGETLOGIN to use getlogin(3) to get the user name (note that
26-/**/#   this may not work if xalarm is invoked from a pseudo terminal).
27-/**/# o Define USECUSERID to use cuserid(3) to get the user name.
28+# Based on an Imakefile from:
29+# Andreas Stolcke
30+# International Computer Science Institute, Berkeley.
31+# With help from:
32+# George Lindholm, Jonathan I. Kamens, Braham Levy.
33+
34+
35+# o Define FORKRETURNSSHORT/FORKRETURNSLONG/FORKRETURNSPID_T if your
36+#   fork(2) returns short/long/pid_t not int.
37+# o Define USEFLOCK or USELOCKF to use flock(2) or lockf(3) to lock files,
38+#   rather than fcntl(2).
39+# o Define USELSEEK to use lseek(2) to move to the end of the file, rather
40+#   than fseek(3).
41+# o Define USERENAME to use rename(2) to rename file names (otherwise
42+#   un/link(2)).
43+# o Define USEGETHOSTNAME or USEUNAME (or neither if you don't have
44+#   gethostname(2) or uname(2)) to get the name of your system.
45+# o Define USEGETPWUID to use getpwuid(3) and getuid(2) to get the user
46+#   name and home directory on your system.  Note that if you want to use
47+#   this method to get the user's home directory, but another method to get
48+#   the user name, this symbol must still be defined.
49+# o Define USEGETLOGIN to use getlogin(3) to get the user name (note that
50+#   this may not work if xalarm is invoked from a pseudo terminal).
51+# o Define USECUSERID to use cuserid(3) to get the user name.
52
53-DEFINES = $(SIGNAL_DEFINES) -DUSERENAME -DUSEGETHOSTNAME -DUSEGETPWUID
54+DEFINES = $(SIGNAL_DEFINES) -DFORKRETURNSPID_T -DUSERENAME -DUSEGETHOSTNAME -DUSEGETPWUID
55
56
57 OBJS = alarm.o when.o warnings.o times.o dates.o file.o fns.o xalarm.o
58@@ -40,28 +40,25 @@
59
60 InstallAppDefaults (XAlarm)
61 InstallAppDefaults (XAlarm-color)
62-InstallMultipleFlags (xmemo xfortune xyow,$(BINDIR),$(INSTBINFLAGS))
63+InstallMultipleFlags (xmemo xfortune,$(BINDIR),$(INSTBINFLAGS))
64 InstallManPage (xmemo,$(MANDIR))
65 InstallManPage (xfortune,$(MANDIR))
66-InstallManPage (xyow,$(MANDIR))
67
68 includes:: fns.h
69
70 fns.h:
71-	@./config.1st -quick $(WHICH) fortune yow
72+	@./config.1st -quick $(WHICH) fortune
73
74-xmemo.man xyow.man xfortune.man:
75-	echo ".so man"`echo ManSuffix`"/xalarm."`echo ManSuffix` > $@
76+xmemo.man xfortune.man:
77+	echo ".so xalarm.man" > $@
78
79 xfortune::
80
81-xyow::
82-
83 clean::
84-	$(RM) xfortune xyow xmemo.man xyow.man xfortune.man fns.h .config
85+	$(RM) xfortune xmemo.man xfortune.man fns.h .config
86
87 config::
88-	@./config.1st -quick $(WHICH) fortune yow
89+	@./config.1st -quick $(WHICH) fortune
90 	@xrdb -merge XAlarm.ad
91 	@xrdb -merge XAlarm.ad+
92
93