- release 2

[packages/xbl.git] / xbl-config.patch

--- xbl-1.1.2/bl.c.orig	2003-08-31 21:59:38.000000000 +0200
+++ xbl-1.1.2/bl.c	2004-04-10 00:13:26.974843528 +0200
@@ -306,8 +306,10 @@
   sprintf(buf,"%s/Xbl",RESOURCEDIR) ;
   getres( XrmGetFileDatabase(buf) , allargs ) ;
 
+  /*
   sprintf(buf,"%s/Xbl",SCOREDIR) ;
   getres( XrmGetFileDatabase(buf) , allargs ) ;
+  */
 
   /* I don't remember why these lines should be commented....
 
--- xbl-1.1.2/buttons.c.orig	2003-06-29 15:40:35.000000000 +0200
+++ xbl-1.1.2/buttons.c	2004-04-10 00:17:01.872174168 +0200
@@ -318,7 +318,7 @@
   FILE *f ;
 
   XFlush(b->menu->bl->x.display) ;
-  sprintf(buf,"%s/COPYING",SCOREDIR) ;
+  sprintf(buf,"/usr/share/xbl/COPYING") ;
   f = fopen( buf,"r" ) ;
 
   if ( f==0 )
--- xbl-1.1.2/Makefile.in.orig	2003-08-31 21:59:38.000000000 +0200
+++ xbl-1.1.2/Makefile.in	2004-04-10 00:20:13.222084560 +0200
@@ -14,7 +14,7 @@
 USE_SETGID=-DUSE_SETGID
 
 # group owner of games file.
-GROUP_GID=5
+GROUP_GID=20
 @GROUP_GID@
 
 ###########################################################################
@@ -23,34 +23,32 @@
 ###########################################################################
 
 # Comment next line if you don't want to use "xmkmf" informations.
-USE_XMKMF=YES
+# USE_XMKMF=YES
 # Comment next line if you don't want to use "imake" informations.
-IMAKE_OPTIONS=-DTOP=/ -DUseInstalled
+# IMAKE_OPTIONS=-DTOP=/ -DUseInstalled
+
+DESTDIR=
 
 # Directory who contain X Resource Database
 # The default value if overrided by configure if xmkmf or imake exists.
 #
-RESOURCEDIR=/usr/lib/X11/app-defaults
-@XAPPLOADDIR@
+RESOURCEDIR=$(DESTDIR)/usr/share/X11/app-defaults
 
 # Directory where install binary
 # The default value if overrided by configure if xmkmf or imake exists.
 #
-BINDIR=/usr/local/bin
-@BINDIR@
+BINDIR=$(DESTDIR)/usr/bin
 
 # Directory who contain score
 # Put your HOME if you have a private use of the game
 # The default value if overrided by configure if xmkmf or imake exists.
 #
-SCOREDIR=/usr/local/lib/xbl
-@SCOREDIR@
+SCOREDIR=$(DESTDIR)/var/games/xbl
 
 # Directory where put man pages.
 # The default value if overrided by configure if xmkmf or imake exists.
 #
-MANPATH=/usr/local/man
-@MANPATH@
+MANPATH=$(DESTDIR)/usr/share/man
 
 ###########################################################################
 # Some values defined in imakefiles
@@ -83,7 +81,7 @@
 
 # For linking (configure script will modify this line)
 # xmkmf et imake informations are take into account.
-LIBS = @LIBS@ -lm
+LIBS = -lXext -lX11 -lm
 
 all:demo
 
@@ -94,7 +92,7 @@
 	 -DRESOURCEDIR=\"$(RESOURCEDIR)\" \
 	 -DXBLVERSION=\"$(XBLVERSION)\" \
 	 -DGROUP_GID=$(GROUP_GID) \
-	  $(USE_SETGID) @DEFS@ @CFLA@ -g
+	  $(USE_SETGID) @DEFS@ @CFLA@ @CFLAGS@
 # For link edit options
 LDOPTIONS=$(CFLAGS)
 LDOPTIONS=@LDOPTIONS@
@@ -124,28 +122,16 @@
 	@echo "Executable go in $(BINDIR)"
 	@echo "Scores     go in $(SCOREDIR)"
 	@echo "Defaults   go in $(RESOURCEDIR)/Xbl"
-	@echo "Man pages  go in $(MANPATH)/mann or man1"
+	@echo "Man pages  go in $(MANPATH)/man6"
 	@-if [ "" != "$(USE_SETGID)" ] ; then \
 		echo "You use GID=$(GROUP_GID) protection" ; \
 		fi
 	@echo "Type <Return> to continue installation"
 	@echo "Type NO       to stop installation"
-	@read LINE && test "" = "$$LINE"
-	#
-	# Remove old score file
-	#
-	@-if [ -d "$(SCOREDIR)" ] ; \
-		then \
-		echo "The scoring method and speeds of Xbl had change" ; \
-		echo "If your version is older than 0.2e, destroy score." ; \
-		echo "Type <Return> to destroy old score files" ; \
-		echo "Type NO       to hold old score files" ; \
-		read LINE && test "" = "$$LINE" && rm $(SCOREDIR)/[1-9]* ; \
-		exit 0 ; \
-		fi
 	#
 	# Install executable
 	#
+	-mkdir -p $(BINDIR)
 	$(CP) bl $(BINDIR)/xbl	
 	-if [ "" = "$(USE_SETGID)" ] ; then \
 	     chmod 755  $(BINDIR)/xbl ;\
@@ -158,9 +144,10 @@
 	# Install executable
 	#
 	-mkdir $(SCOREDIR) 2>/dev/null
+	-mkdir -p $(RESOURCEDIR) $(SCOREDIR) $(DESTDIR)/usr/share/xbl
 	$(CP) Xbl.ad  $(RESOURCEDIR)/Xbl ;	chmod 644 $(RESOURCEDIR)/Xbl
 	$(CP) Xbl.ad  $(SCOREDIR)/Xbl ;		chmod 644 $(SCOREDIR)/Xbl
-	$(CP) COPYING  $(SCOREDIR) ;		chmod 444 $(SCOREDIR)/COPYING
+	$(CP) COPYING $(DESTDIR)/usr/share/xbl
 	-if [ "" = "$(USE_SETGID)" ] ; then \
 	     chmod 777 $(SCOREDIR) ;\
 	     chmod 666 $(SCOREDIR)/[1-9]* ;\
@@ -173,17 +160,15 @@
 	#
 	# Install manual pages
 	#
-	-if [ -d $(MANPATH)/mann ] ; \
+	-mkdir -p $(MANPATH)/man6
+	-if [ -d $(MANPATH)/man6 ] ; \
 		then \
-		$(CP) xbl.man $(MANPATH)/mann/xbl.n ;\
-		chmod 444 $(MANPATH)/mann/xbl.n ; \
+		$(CP) xbl.man $(MANPATH)/man6/xbl.6x ;\
+		chmod 444 $(MANPATH)/man6/xbl.6x ; \
 	   else \
 		$(CP) xbl.man $(MANPATH)/man1/xbl.1 ;\
 		chmod 444 $(MANPATH)/man1/xbl.1 ; \
 		fi
-	cp *.gif *.html $(SCOREDIR)
-	#
-	-ls -lsa $(SCOREDIR) $(BINDIR)/xbl $(MANPATH)/man[1n]/xbl.[1n]
 	@echo "Type xbl to play"
 
 bl:$(OBJ)