-diff -durN crossfire-0.95.8.orig/Makefile.in crossfire-0.95.8/Makefile.in
---- crossfire-0.95.8.orig/Makefile.in Wed Nov 29 07:30:13 2000
-+++ crossfire-0.95.8/Makefile.in Mon Jan 29 10:10:36 2001
+diff -durN crossfire-0.98.0.orig/Makefile.in crossfire-0.98.0/Makefile.in
+--- crossfire-0.98.0.orig/Makefile.in Sun Apr 8 07:49:34 2001
++++ crossfire-0.98.0/Makefile.in Tue Apr 17 09:34:56 2001
@@ -124,7 +124,7 @@
install::
fi
@for dir in $(SUBDIRS); \
do \
-diff -durN crossfire-0.95.8.orig/crossedit/Makefile.in crossfire-0.95.8/crossedit/Makefile.in
---- crossfire-0.95.8.orig/crossedit/Makefile.in Wed Nov 29 07:30:16 2000
-+++ crossfire-0.95.8/crossedit/Makefile.in Mon Jan 29 10:10:36 2001
+diff -durN crossfire-0.98.0.orig/crossedit/Makefile.in crossfire-0.98.0/crossedit/Makefile.in
+--- crossfire-0.98.0.orig/crossedit/Makefile.in Sun Apr 8 07:49:35 2001
++++ crossfire-0.98.0/crossedit/Makefile.in Tue Apr 17 09:34:56 2001
@@ -151,7 +151,7 @@
fi
- $(INSTALL) crossedit ${bindir}/crossedit
+ $(INSTALL) crossedit $(DESTDIR)${bindir}/crossedit
-diff -durN crossfire-0.95.8.orig/doc/Makefile.in crossfire-0.95.8/doc/Makefile.in
---- crossfire-0.95.8.orig/doc/Makefile.in Wed Nov 29 07:30:16 2000
-+++ crossfire-0.95.8/doc/Makefile.in Mon Jan 29 10:10:36 2001
+diff -durN crossfire-0.98.0.orig/doc/Makefile.in crossfire-0.98.0/doc/Makefile.in
+--- crossfire-0.98.0.orig/doc/Makefile.in Sun Apr 8 07:49:34 2001
++++ crossfire-0.98.0/doc/Makefile.in Tue Apr 17 09:34:56 2001
@@ -76,8 +76,8 @@
$(RM) -rf $(DTOP)
- $(INSTALL) $(srcdir)/crossfire.man $(MAN1)/crossfire.$(MANSUFFIX)
+ $(INSTALL) $(srcdir)/crossedit.man $(DESTDIR)$(MAN1)/crossedit.$(MANSUFFIX)
+ $(INSTALL) $(srcdir)/crossfire.man $(DESTDIR)$(MAN1)/crossfire.$(MANSUFFIX)
-diff -durN crossfire-0.95.8.orig/lib/Makefile.in crossfire-0.95.8/lib/Makefile.in
---- crossfire-0.95.8.orig/lib/Makefile.in Wed Nov 29 07:30:14 2000
-+++ crossfire-0.95.8/lib/Makefile.in Mon Jan 29 10:10:36 2001
-@@ -106,38 +106,38 @@
+diff -durN crossfire-0.98.0.orig/lib/Makefile.in crossfire-0.98.0/lib/Makefile.in
+--- crossfire-0.98.0.orig/lib/Makefile.in Sun Apr 8 07:49:34 2001
++++ crossfire-0.98.0/lib/Makefile.in Tue Apr 17 09:41:10 2001
+@@ -110,43 +110,43 @@
make collect
- install:: archetypes bmaps.paths crossfire.xbm crossfire.xpm crossfire.png animations
+ install:: archetypes bmaps.paths crossfire.xbm crossfire.xpm crossfire.png animations collect.pl xpmtopix.pl util.pl
- @if [ ! -d $(datadir) ]; then \
- $(MKDIR) -p $(datadir); \
+ @if [ ! -d $(DESTDIR)$(datadir) ]; then \
fi
- if [ ! -d $(datadir)/help ]; then \
-+ if [ ! -d $(DESTDIR)$(datadir)/help ]; then \
- echo "Creating directory $(datadir)/help"; \
+- echo "Creating directory $(datadir)/help"; \
- $(MKDIR) -p $(datadir)/help; \
++ if [ ! -d $(DESTDIR)$(datadir)/help ]; then \
++ echo "Creating directory $(DESTDIR)$(datadir)/help"; \
+ $(MKDIR) -p $(DESTDIR)$(datadir)/help; \
fi;
@for i in $(FILES_HELP); do \
+ $(INSTALL) $(INSTALLFLAGS) $$i $(DESTDIR)$(datadir); \
done
- @if [ ! -f $(datadir)/settings ]; then \
+ @for i in $(BININSTALL); do \
+ echo "Installing $$i"; \
+- $(INSTALL) $(INSTALLFLAGS) $$i $(bindir); \
++ $(INSTALL) $(INSTALLFLAGS) $$i $(DESTDIR)$(bindir); \
+ done
+
+- @if [ ! -f $(datadir)/settings ]; then \
- $(INSTALL) $(INSTALLFLAGS) settings $(datadir); \
++ @if [ ! -f $(DESTDIR)$(datadir)/settings ]; then \
+ $(INSTALL) $(INSTALLFLAGS) settings $(DESTDIR)$(datadir); \
fi
+ touch $(DESTDIR)$(localdir)/temp.maps
@for i in players unique-items; do \
- if [ ! -d $(localdir)/$$i ]; then \
- echo "Creating directory $(localdir)/$$i"; \
+- if [ ! -d $(localdir)/$$i ]; then \
+- echo "Creating directory $(localdir)/$$i"; \
- $(MKDIR) -p $(localdir)/$$i; \
++ if [ ! -d $(DESTDIR)$(localdir)/$$i ]; then \
++ echo "Creating directory $(DESTDIR)$(localdir)/$$i"; \
+ $(MKDIR) -p $(DESTDIR)$(localdir)/$$i; \
fi; \
done
-diff -durN crossfire-0.95.8.orig/random_maps/Makefile.in crossfire-0.95.8/random_maps/Makefile.in
---- crossfire-0.95.8.orig/random_maps/Makefile.in Wed Nov 29 07:30:14 2000
-+++ crossfire-0.95.8/random_maps/Makefile.in Mon Jan 29 10:11:10 2001
-@@ -118,10 +118,10 @@
+diff -durN crossfire-0.98.0.orig/random_maps/Makefile.in crossfire-0.98.0/random_maps/Makefile.in
+--- crossfire-0.98.0.orig/random_maps/Makefile.in Sun Apr 8 07:49:34 2001
++++ crossfire-0.98.0/random_maps/Makefile.in Tue Apr 17 09:34:56 2001
+@@ -122,10 +122,10 @@
@echo $(SRCS) > .patchlist
install:: random_map
-diff -durN crossfire-0.95.8.orig/server/Makefile.in crossfire-0.95.8/server/Makefile.in
---- crossfire-0.95.8.orig/server/Makefile.in Wed Nov 29 07:30:14 2000
-+++ crossfire-0.95.8/server/Makefile.in Mon Jan 29 10:10:36 2001
-@@ -138,7 +138,7 @@
+diff -durN crossfire-0.98.0.orig/server/Makefile.in crossfire-0.98.0/server/Makefile.in
+--- crossfire-0.98.0.orig/server/Makefile.in Sun Apr 8 07:49:34 2001
++++ crossfire-0.98.0/server/Makefile.in Tue Apr 17 09:34:56 2001
+@@ -139,7 +139,7 @@
@echo $(SRCS) > .patchlist
install:: crossfire
fi
- $(INSTALL) crossfire ${bindir}/crossfire
+ $(INSTALL) crossfire $(DESTDIR)${bindir}/crossfire
-diff -durN crossfire-0.95.8.orig/utils/Makefile.in crossfire-0.95.8/utils/Makefile.in
---- crossfire-0.95.8.orig/utils/Makefile.in Wed Nov 29 07:30:16 2000
-+++ crossfire-0.95.8/utils/Makefile.in Mon Jan 29 10:10:36 2001
-@@ -19,20 +19,20 @@
+diff -durN crossfire-0.98.0.orig/utils/Makefile.in crossfire-0.98.0/utils/Makefile.in
+--- crossfire-0.98.0.orig/utils/Makefile.in Sun Apr 8 07:49:34 2001
++++ crossfire-0.98.0/utils/Makefile.in Tue Apr 17 09:34:56 2001
+@@ -20,20 +20,20 @@
$(DEPEND) $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- $(SRCS)
install:
-diff -durN crossfire-0.95.8.orig/include/config.h crossfire-0.95.8/include/config.h
---- crossfire-0.95.8.orig/include/config.h Wed Nov 29 07:30:14 2000
-+++ crossfire-0.95.8/include/config.h Fri Feb 2 13:29:37 2001
-@@ -670,7 +670,7 @@
- */
-
- #ifndef LOGFILE
+diff -durN crossfire-0.98.0.orig/include/config.h crossfire-0.98.0/include/config.h
+--- crossfire-0.98.0.orig/include/config.h Sun Apr 8 07:49:34 2001
++++ crossfire-0.98.0/include/config.h Tue Apr 17 09:45:40 2001
+@@ -680,7 +680,7 @@
+ #ifdef WIN32 /* change define path */
+ #define LOGFILE "tmp\\cross.log"
+ #else
-#define LOGFILE "/tmp/cross.log"
+#define LOGFILE "/var/log/crossfire"
#endif
+ #endif
- /*
-@@ -850,7 +850,7 @@
- */
-
- /*#define TMPDIR "/home/hugin/a/crossfire/crossfire/tmp"*/
+@@ -830,7 +830,7 @@
+ #ifdef WIN32 /* change define path tmp */
+ #define TMPDIR "tmp"
+ #else
-#define TMPDIR "/tmp"
+#define TMPDIR "/var/lib/crossfire/tmp"
+ #endif
- /* Directory to use for unique items. This is placed into the 'lib'
-diff -durN crossfire-0.95.8.orig/server/main.c crossfire-0.95.8/server/main.c
---- crossfire-0.95.8.orig/server/main.c Wed Nov 29 07:30:14 2000
-+++ crossfire-0.95.8/server/main.c Fri Feb 2 13:31:14 2001
+diff -durN crossfire-0.98.0.orig/server/main.c crossfire-0.98.0/server/main.c
+--- crossfire-0.98.0.orig/server/main.c Sun Apr 8 07:49:34 2001
++++ crossfire-0.98.0/server/main.c Tue Apr 17 09:44:01 2001
@@ -29,6 +29,7 @@
#include <version.h>
#include <global.h>
#ifdef HAVE_DES_H
#include <des.h>
-@@ -234,7 +235,7 @@
- {
- mapstruct *new_map;
- FILE *newmap_params; /* give the new map its parameters */
-- newmap_params=fopen("/tmp/rmap_params","w");
-+ newmap_params=fopen(TMPDIR"/rmap_params","w");
- if(newmap_params!=NULL) {
- char newmap_name[HUGE_BUF];
- char oldmap_name[HUGE_BUF];
-@@ -265,7 +266,7 @@
- sprintf(newmap_name,"/random/%016d",reference_number++);
-
- /* now to generate the actual map. */
-- new_map=(mapstruct *)generate_random_map("/tmp/rmap_params",newmap_name);
-+ new_map=(mapstruct *)generate_random_map(TMPDIR"/rmap_params",newmap_name);
-
- /* set the hp,sp,path of the exit for the new */
- if(new_map) {