updated to 1.3.0

Changed files:
    crossfire-DESTDIR.patch -> 1.2.2.2

diff --git a/crossfire-DESTDIR.patch b/crossfire-DESTDIR.patch
index e38eed6e4c447f464e627c3edc6995d76fbc9a0d..adbcc04f403362b7497b01431dbea9a1b7112385 100644 (file)
--- a/crossfire-DESTDIR.patch
+++ b/crossfire-DESTDIR.patch
@@ -1,52 +1,38 @@
-diff -durN crossfire-1.1.0.orig/Makefile.in crossfire-1.1.0/Makefile.in
---- crossfire-1.1.0.orig/Makefile.in   Wed Mar 20 07:36:53 2002
-+++ crossfire-1.1.0/Makefile.in        Fri Mar 22 13:14:37 2002
-@@ -124,7 +124,7 @@
+--- crossfire-1.3.0/random_maps/Makefile.in.wiget      Tue Jul  2 01:18:12 2002
++++ crossfire-1.3.0/random_maps/Makefile.in    Mon Jul  8 21:19:04 2002
+@@ -125,10 +125,10 @@
+       @echo $(SRCS) > .patchlist
  
- install::
-       @if [ ! -d ${prefix} ]; then \
--              $(MKDIR) -p ${prefix}; \
-+              $(MKDIR) -p $(DESTDIR)${prefix}; \
+ install:: random_map
+-      @if [ ! -d ${bindir} ]; then \
+-              $(MKDIR) -p ${bindir}; \
++      @if [ ! -d $(DESTDIR)${bindir} ]; then \
++              $(MKDIR) -p $(DESTDIR)${bindir}; \
        fi
-       @for dir in $(SUBDIRS); \
-       do \
-diff -durN crossfire-1.1.0.orig/crossedit/Makefile.in crossfire-1.1.0/crossedit/Makefile.in
---- crossfire-1.1.0.orig/crossedit/Makefile.in Wed Mar 20 07:36:54 2002
-+++ crossfire-1.1.0/crossedit/Makefile.in      Fri Mar 22 13:14:37 2002
-@@ -150,7 +150,7 @@
+-      $(INSTALL) random_map ${bindir}/random_map
++      $(INSTALL) random_map $(DESTDIR)${bindir}/random_map
  
  
- install:: crossedit
+ 
+--- crossfire-1.3.0/server/Makefile.in.wiget   Tue Jul  2 01:18:12 2002
++++ crossfire-1.3.0/server/Makefile.in Mon Jul  8 21:19:04 2002
+@@ -139,7 +139,7 @@
+       @echo $(SRCS) > .patchlist
+ 
+ install:: crossfire
 -      @if [ ! -d ${bindir} ]; then \
 -              $(MKDIR) -p ${bindir}; \
 +      @if [ ! -d $(DESTDIR)${bindir} ]; then \
 +              $(MKDIR) -p $(DESTDIR)${bindir}; \
        fi
--      $(INSTALL) crossedit ${bindir}/crossedit
-+      $(INSTALL) crossedit $(DESTDIR)${bindir}/crossedit
-diff -durN crossfire-1.1.0.orig/doc/Makefile.in crossfire-1.1.0/doc/Makefile.in
---- crossfire-1.1.0.orig/doc/Makefile.in       Wed Mar 20 07:36:54 2002
-+++ crossfire-1.1.0/doc/Makefile.in    Fri Mar 22 13:14:37 2002
-@@ -106,8 +106,8 @@
-       $(RM) -rf $(DTOP)
- 
- install::
--      @if [ ! -d $(MAN1) ]; then \
--              $(MKDIR) -p $(MAN1); \
-+      @if [ ! -d $(DESTDIR)$(MAN1) ]; then \
-+              $(MKDIR) -p $(DESTDIR)$(MAN1); \
-       fi
--      $(INSTALL) $(srcdir)/crossedit.man $(MAN1)/crossedit.$(MANSUFFIX)
--      $(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-1.1.0.orig/lib/Makefile.in crossfire-1.1.0/lib/Makefile.in
---- crossfire-1.1.0.orig/lib/Makefile.in       Wed Mar 20 07:36:54 2002
-+++ crossfire-1.1.0/lib/Makefile.in    Fri Mar 22 13:16:31 2002
-@@ -126,51 +126,51 @@
+-      $(INSTALL) crossfire ${bindir}/crossfire
++      $(INSTALL) crossfire $(DESTDIR)${bindir}/crossfire
+--- crossfire-1.3.0/lib/Makefile.in.wiget      Tue Jul  2 01:18:12 2002
++++ crossfire-1.3.0/lib/Makefile.in    Mon Jul  8 21:25:19 2002
+@@ -131,58 +131,58 @@
        make collect
  
- install:: archetypes bmaps.paths crossfire.0 animations collect.pl util.pl
+ install:: archetypes bmaps.paths crossfire.0 faces animations collect.pl util.pl
 -      @if [ ! -d $(datadir) ]; then \
 -              $(MKDIR) -p $(datadir); \
 +      @if [ ! -d $(DESTDIR)$(datadir) ]; then \
@@ -58,10 +44,10 @@ diff -durN crossfire-1.1.0.orig/lib/Makefile.in crossfire-1.1.0/lib/Makefile.in
 +              $(MKDIR) -p $(DESTDIR)$(localdir); \
        fi
  
--      if [ ! -d $(datadir)/help ]; then \
+-      @if [ ! -d $(datadir)/help ]; then \
 -              echo "Creating directory $(datadir)/help"; \
 -              $(MKDIR) -p $(datadir)/help; \
-+      if [ ! -d $(DESTDIR)$(datadir)/help ]; then \
++      @if [ ! -d $(DESTDIR)$(datadir)/help ]; then \
 +              echo "Creating directory $(DESTDIR)$(datadir)/help"; \
 +              $(MKDIR) -p $(DESTDIR)$(datadir)/help; \
        fi;
@@ -70,10 +56,10 @@ diff -durN crossfire-1.1.0.orig/lib/Makefile.in crossfire-1.1.0/lib/Makefile.in
 -          $(INSTALL) $(INSTALLFLAGS) $$i $(datadir)/help; \
 +          $(INSTALL) $(INSTALLFLAGS) $$i $(DESTDIR)$(datadir)/help; \
        done
--      if [ ! -d $(datadir)/wizhelp ]; then \
+-      @if [ ! -d $(datadir)/wizhelp ]; then \
 -              echo "Creating directory $(datadir)/wizhelp"; \
 -              $(MKDIR) -p $(datadir)/wizhelp; \
-+      if [ ! -d $(DESTDIR)$(datadir)/wizhelp ]; then \
++      @if [ ! -d $(DESTDIR)$(datadir)/wizhelp ]; then \
 +              echo "Creating directory $(DESTDIR)$(datadir)/wizhelp"; \
 +              $(MKDIR) -p $(DESTDIR)$(datadir)/wizhelp; \
        fi;
@@ -94,11 +80,21 @@ diff -durN crossfire-1.1.0.orig/lib/Makefile.in crossfire-1.1.0/lib/Makefile.in
 +              $(INSTALL) $(INSTALLFLAGS)  $$i $(DESTDIR)$(bindir); \
        done
  
-       @if [ ! -f $(datadir)/settings ]; then \
+-      @if [ ! -f $(datadir)/settings ]; then \
 -              $(INSTALL) $(INSTALLFLAGS) settings $(datadir); \
++      @if [ ! -f $(DESTDIR)$(datadir)/settings ]; then \
 +              $(INSTALL) $(INSTALLFLAGS) settings $(DESTDIR)$(datadir); \
        fi
  
+       @for i in $(INSTALLNEWFILES); do \
+-          if [ ! -f $(datadir)/$$i ]; then \
++          if [ ! -f $(DESTDIR)$(datadir)/$$i ]; then \
+                   echo "Installing $$i"; \
+-                  $(INSTALL) $(INSTALLFLAGS)  $$i $(datadir); \
++                  $(INSTALL) $(INSTALLFLAGS)  $$i $(DESTDIR)$(datadir); \
+           fi \
+       done
+ 
 -      touch $(localdir)/highscore
 -      touch $(localdir)/bookarch
 -      touch $(localdir)/temp.maps
@@ -107,49 +103,18 @@ diff -durN crossfire-1.1.0.orig/lib/Makefile.in crossfire-1.1.0/lib/Makefile.in
 +      touch $(DESTDIR)$(localdir)/temp.maps
  
        @for i in players unique-items; do \
-           if [ ! -d $(localdir)/$$i ]; then \
+-          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-1.1.0.orig/random_maps/Makefile.in crossfire-1.1.0/random_maps/Makefile.in
---- crossfire-1.1.0.orig/random_maps/Makefile.in       Wed Mar 20 07:36:53 2002
-+++ crossfire-1.1.0/random_maps/Makefile.in    Fri Mar 22 13:14:37 2002
-@@ -123,10 +123,10 @@
-       @echo $(SRCS) > .patchlist
- 
- install:: random_map
--      @if [ ! -d ${bindir} ]; then \
--              $(MKDIR) -p ${bindir}; \
-+      @if [ ! -d $(DESTDIR)${bindir} ]; then \
-+              $(MKDIR) -p $(DESTDIR)${bindir}; \
-       fi
--      $(INSTALL) random_map ${bindir}/random_map
-+      $(INSTALL) random_map $(DESTDIR)${bindir}/random_map
- 
- 
- 
-diff -durN crossfire-1.1.0.orig/server/Makefile.in crossfire-1.1.0/server/Makefile.in
---- crossfire-1.1.0.orig/server/Makefile.in    Wed Mar 20 07:36:53 2002
-+++ crossfire-1.1.0/server/Makefile.in Fri Mar 22 13:14:37 2002
-@@ -139,7 +139,7 @@
-       @echo $(SRCS) > .patchlist
- 
- install:: crossfire
--      @if [ ! -d ${bindir} ]; then \
--              $(MKDIR) -p ${bindir}; \
-+      @if [ ! -d $(DESTDIR)${bindir} ]; then \
-+              $(MKDIR) -p $(DESTDIR)${bindir}; \
-       fi
--      $(INSTALL) crossfire ${bindir}/crossfire
-+      $(INSTALL) crossfire $(DESTDIR)${bindir}/crossfire
-diff -durN crossfire-1.1.0.orig/utils/Makefile.in crossfire-1.1.0/utils/Makefile.in
---- crossfire-1.1.0.orig/utils/Makefile.in     Wed Mar 20 07:36:54 2002
-+++ crossfire-1.1.0/utils/Makefile.in  Fri Mar 22 13:17:35 2002
-@@ -20,20 +20,20 @@
+--- crossfire-1.3.0/utils/Makefile.in.wiget    Tue Jul  2 01:18:21 2002
++++ crossfire-1.3.0/utils/Makefile.in  Mon Jul  8 21:27:34 2002
+@@ -20,22 +20,22 @@
        $(DEPEND) $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- $(SRCS)
  
  install:
@@ -169,6 +134,8 @@ diff -durN crossfire-1.1.0.orig/utils/Makefile.in crossfire-1.1.0/utils/Makefile
 -      chmod 755 $(bindir)/crossloop
 -      $(INSTALL) $(INSTALLFLAGS) mktable.script $(bindir)/mktable
 -      $(INSTALL) $(INSTALLFLAGS) add_throw.perl $(bindir)/add_throw
+-      @if [ ! -f $(bindir)/crossloop.web ]; then \
+-              $(INSTALL) $(INSTALLFLAGS) crossloop.web $(bindir)/crossloop.web; \
 +      rm -f $(DESTDIR)$(bindir)/flushlocks
 +      sed s%xxxx%$(libdir)%g <flushlocks > $(DESTDIR)$(bindir)/flushlocks
 +      chmod 755 $(DESTDIR)$(bindir)/flushlocks
@@ -180,6 +147,66 @@ diff -durN crossfire-1.1.0.orig/utils/Makefile.in crossfire-1.1.0/utils/Makefile
 +      chmod 755 $(DESTDIR)$(bindir)/crossloop
 +      $(INSTALL) $(INSTALLFLAGS) mktable.script $(DESTDIR)$(bindir)/mktable
 +      $(INSTALL) $(INSTALLFLAGS) add_throw.perl $(DESTDIR)$(bindir)/add_throw
++      @if [ ! -f $(DESTDIR)$(bindir)/crossloop.web ]; then \
++              $(INSTALL) $(INSTALLFLAGS) crossloop.web $(DESTDIR)$(bindir)/crossloop.web; \
+       fi
  
  depend::
+--- crossfire-1.3.0/doc/Makefile.in.wiget      Tue Jul  2 01:18:21 2002
++++ crossfire-1.3.0/doc/Makefile.in    Mon Jul  8 21:19:04 2002
+@@ -106,8 +106,8 @@
+       $(RM) -rf $(DTOP)
+ 
+ install::
+-      @if [ ! -d $(MAN1) ]; then \
+-              $(MKDIR) -p $(MAN1); \
++      @if [ ! -d $(DESTDIR)$(MAN1) ]; then \
++              $(MKDIR) -p $(DESTDIR)$(MAN1); \
+       fi
+-      $(INSTALL) $(srcdir)/crossedit.man $(MAN1)/crossedit.$(MANSUFFIX)
+-      $(INSTALL) $(srcdir)/crossfire.man $(MAN1)/crossfire.$(MANSUFFIX)
++      $(INSTALL) $(srcdir)/crossedit.man $(DESTDIR)$(MAN1)/crossedit.$(MANSUFFIX)
++      $(INSTALL) $(srcdir)/crossfire.man $(DESTDIR)$(MAN1)/crossfire.$(MANSUFFIX)
+--- crossfire-1.3.0/crossedit/Makefile.in.wiget        Tue Jul  2 01:18:22 2002
++++ crossfire-1.3.0/crossedit/Makefile.in      Mon Jul  8 21:19:04 2002
+@@ -150,7 +150,7 @@
+ 
+ 
+ install:: crossedit
+-      @if [ ! -d ${bindir} ]; then \
+-              $(MKDIR) -p ${bindir}; \
++      @if [ ! -d $(DESTDIR)${bindir} ]; then \
++              $(MKDIR) -p $(DESTDIR)${bindir}; \
+       fi
+-      $(INSTALL) crossedit ${bindir}/crossedit
++      $(INSTALL) crossedit $(DESTDIR)${bindir}/crossedit
+--- crossfire-1.3.0/Makefile.in.wiget  Tue Jul  2 01:18:12 2002
++++ crossfire-1.3.0/Makefile.in        Mon Jul  8 21:19:04 2002
+@@ -124,7 +124,7 @@
+ 
+ install::
+       @if [ ! -d ${prefix} ]; then \
+-              $(MKDIR) -p ${prefix}; \
++              $(MKDIR) -p $(DESTDIR)${prefix}; \
+       fi
+       @for dir in $(SUBDIRS); \
+       do \
+--- crossfire-1.3.0/plugin/Makefile.in.destdir Mon Jul  8 21:43:03 2002
++++ crossfire-1.3.0/plugin/Makefile.in Mon Jul  8 21:44:19 2002
+@@ -65,12 +65,12 @@
+ # as such, if plugin target is set, then we install, otherwise 
+ # we don't do anything.
+ install:
+-      @if [ ! -d $(CROSSFIRE_PATH)/plugins ]; then \
+-          echo "Creating directory $(CROSSFIRE_PATH)/plugins"; \
+-          $(MKDIR) -p $(CROSSFIRE_PATH)/plugins; \
++      @if [ ! -d $(DESTDIR)$(CROSSFIRE_PATH)/plugins ]; then \
++          echo "Creating directory $(DESTDIR)$(CROSSFIRE_PATH)/plugins"; \
++          $(MKDIR) -p $(DESTDIR)$(CROSSFIRE_PATH)/plugins; \
+       fi
+       @if [ "X$(PLUGIN_TARGET)" != "X" ]; then \
+-              $(INSTALL) plugin_python.so.0.1 $(CROSSFIRE_PATH)/plugins; \
++              $(INSTALL) plugin_python.so.0.1 $(DESTDIR)$(CROSSFIRE_PATH)/plugins; \
+       fi
  
+ plugin_python.so.0.1: $(OBJS) ../common/libcross.a