fix detecting shared libpython

[packages/crossfire.git] / crossfire-DESTDIR.patch

diff --git a/crossfire-DESTDIR.patch b/crossfire-DESTDIR.patch
index 5f78fb507ecd372b130bce33f288ed83e05ff385..4d1b8226a86627a938f8871338aff4bb8296739f 100644 (file)
--- a/crossfire-DESTDIR.patch
+++ b/crossfire-DESTDIR.patch
@@ -1,6 +1,6 @@
-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::
@@ -10,9 +10,9 @@ diff -durN crossfire-0.95.8.orig/Makefile.in crossfire-0.95.8/Makefile.in
        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 @@
  
  
@@ -24,9 +24,9 @@ diff -durN crossfire-0.95.8.orig/crossedit/Makefile.in crossfire-0.95.8/crossedi
        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)
  
@@ -40,13 +40,13 @@ diff -durN crossfire-0.95.8.orig/doc/Makefile.in crossfire-0.95.8/doc/Makefile.i
 -      $(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 \
@@ -59,9 +59,10 @@ diff -durN crossfire-0.95.8.orig/lib/Makefile.in crossfire-0.95.8/lib/Makefile.i
        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 \
@@ -75,8 +76,15 @@ diff -durN crossfire-0.95.8.orig/lib/Makefile.in crossfire-0.95.8/lib/Makefile.i
 +          $(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
  
@@ -88,17 +96,19 @@ diff -durN crossfire-0.95.8.orig/lib/Makefile.in crossfire-0.95.8/lib/Makefile.i
 +      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
@@ -112,10 +122,10 @@ diff -durN crossfire-0.95.8.orig/random_maps/Makefile.in crossfire-0.95.8/random
  
  
  
-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
@@ -126,10 +136,10 @@ diff -durN crossfire-0.95.8.orig/server/Makefile.in crossfire-0.95.8/server/Make
        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: