1 diff -Bru fbmuck-6.07.orig/src/Makefile.in fbmuck-6.07/src/Makefile.in
2 --- fbmuck-6.07.orig/src/Makefile.in 2005-08-28 17:32:59.000000000 -0700
3 +++ fbmuck-6.07/src/Makefile.in 2006-11-21 11:45:00.000000000 -0800
5 INCLUDE= ${ROOT}/include
7 # The root of the directory tree to install to.
10 exec_prefix=@exec_prefix@
11 # Destinations for binaries
12 INSTALL_BINDIR=@bindir@
13 INSTALL_SBINDIR=@sbindir@
14 # Destination for helpfiles
15 -INSTALL_HELPDIR=@datadir@/fbmuck
16 +INSTALL_HELPDIR=${D}@datadir@/fbmuck
17 # Destination for starter databases
18 -INSTALL_DBSDIR=@datadir@/fbmuck/starter_dbs
19 +INSTALL_DBSDIR=${D}@datadir@/fbmuck/starter_dbs
21 # ${DESTDIR} is used by the Debian packaging system to build the .debs
22 # and is defined by the debian/rules file.
24 @echo "#define BINDIR \"$(INSTALL_BINDIR)\"" >> $(INCLUDE)/defines.h
25 @echo "#define INSTALL_HELPDIR \"$(INSTALL_HELPDIR)\"" >> $(INCLUDE)/defines.h
27 -fbmuck: $(INCLUDE)/defines.h libpcre.a ${P} ${COBJ} ${MALLOBJ} interface.o ${LOBJ} mkversion.sh Makefile
28 +fbmuck: $(INCLUDE)/defines.h libpcre.a ${COBJ} ${MALLOBJ} interface.o ${LOBJ} mkversion.sh Makefile
30 ${PRE} ${CC} ${CFLAGS} ${INCL} ${DEFS} -c version.c
31 if [ -f fbmuck ]; then ${MV} fbmuck fbmuck~ ; fi
32 diff -Bru fbmuck-6.07.orig/src/mkversion.sh fbmuck-6.07/src/mkversion.sh
33 --- fbmuck-6.07.orig/src/mkversion.sh 2005-07-06 21:32:32.000000000 -0700
34 +++ fbmuck-6.07/src/mkversion.sh 2006-11-21 11:44:08.000000000 -0800
36 notify_nolisten(player, smatch_h_version, 1);
37 notify_nolisten(player, speech_h_version, 1);
38 notify_nolisten(player, tune_h_version, 1);
39 - notify_nolisten(player, version_h_version, 1);
43 diff -Bru fbmuck-6.07.orig/src/predicates.c fbmuck-6.07/src/predicates.c
44 --- fbmuck-6.07.orig/src/predicates.c 2006-11-26 18:04:52.000000000 -0800
45 +++ fbmuck-6.07/src/predicates.c 2006-11-26 17:57:28.000000000 -0800
48 /* We don't want someone setting themselves !W, to prevent
49 * a case where there are no wizards at all */
50 - return ((Typeof(thing) == TYPE_PLAYER && thing == OWNER(player));
51 + return ((Typeof(thing) == TYPE_PLAYER) && thing == OWNER(player));