File xbl-1.1.5-config.patch of Package xbl
--- Makefile.in
+++ Makefile.in
@@ -43,7 +43,7 @@
# 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=/var/games/xbl
@SCOREDIR@
# Directory where put man pages.
@@ -121,69 +121,51 @@
# XBLOPTIONS="-shownext" ; export XBLOPTIONS ; bl -smooth keyboard=1
install:bl
- @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 "Executable goes in $(BINDIR)"
+ @echo "Scores go in $(SCOREDIR)"
+ @echo "Defaults go in $(RESOURCEDIR)/Xbl"
+ @echo "Man pages go in $(MANPATH)/mann or 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
+ fi
#
# Install executable
#
- $(CP) bl $(BINDIR)/xbl
+ $(CP) bl $(DESTDIR)$(BINDIR)/xbl
-if [ "" = "$(USE_SETGID)" ] ; then \
- chmod 755 $(BINDIR)/xbl ;\
+ chmod 755 $(DESTDIR)$(BINDIR)/xbl ;\
else \
- chmod 2755 $(BINDIR)/xbl ;\
- chown root $(BINDIR)/xbl ;\
- chgrp $(GROUP_GID) $(BINDIR)/xbl ;\
+ chmod 2755 $(DESTDIR)$(BINDIR)/xbl ;\
+ chown root $(DESTDIR)$(BINDIR)/xbl ;\
+ chgrp $(GROUP_GID) $(DESTDIR)$(BINDIR)/xbl ;\
fi
#
# Install executable
#
- -mkdir $(SCOREDIR) 2>/dev/null
- $(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
+ -mkdir $(DESTDIR)$(SCOREDIR) 2>/dev/null
+ $(CP) Xbl.ad $(DESTDIR)$(RESOURCEDIR)/Xbl ; chmod 644 $(DESTDIR)$(RESOURCEDIR)/Xbl
-if [ "" = "$(USE_SETGID)" ] ; then \
- chmod 777 $(SCOREDIR) ;\
- chmod 666 $(SCOREDIR)/[1-9]* ;\
+ chmod 777 $(DESTDIR)$(SCOREDIR) ;\
+ chmod 666 $(DESTDIR)$(SCOREDIR)/[1-9]* ;\
else \
- chmod 775 $(SCOREDIR) ;\
- chmod 664 $(SCOREDIR)/[1-9]* ;\
- chown root $(SCOREDIR) $(SCOREDIR)/[1-9]* ;\
- chgrp $(GROUP_GID) $(SCOREDIR) $(SCOREDIR)/[1-9]* ;\
+ chmod 775 $(DESTDIR)$(SCOREDIR) ;\
+ chmod 664 $(DESTDIR)$(SCOREDIR)/[1-9]* ;\
+ chown root $(DESTDIR)$(SCOREDIR) $(DESTDIR)$(SCOREDIR)/[1-9]* ;\
+ chgrp $(GROUP_GID) $(DESTDIR)$(SCOREDIR) $(DESTDIR)$(SCOREDIR)/[1-9]* ;\
fi
#
# Install manual pages
#
- -if [ -d $(MANPATH)/mann ] ; \
+ -if [ -d $(DESTDIR)$(MANPATH)/mann ] ; \
then \
- $(CP) xbl.man $(MANPATH)/mann/xbl.n ;\
- chmod 444 $(MANPATH)/mann/xbl.n ; \
+ $(CP) xbl.man $(DESTDIR)$(MANPATH)/mann/xbl.n ;\
+ chmod 444 $(DESTDIR)$(MANPATH)/mann/xbl.n ; \
else \
- $(CP) xbl.man $(MANPATH)/man1/xbl.1 ;\
- chmod 444 $(MANPATH)/man1/xbl.1 ; \
+ $(CP) xbl.man $(DESTDIR)$(MANPATH)/man6/xbl.6 ;\
+ chmod 444 $(DESTDIR)$(MANPATH)/man6/xbl.6 ; \
fi
- cp *.gif *.html $(SCOREDIR)
#
- -ls -lsa $(SCOREDIR) $(BINDIR)/xbl $(MANPATH)/man[1n]/xbl.[1n]
+ -ls -lsa $(DESTDIR)$(SCOREDIR) $(DESTDIR)$(BINDIR)/xbl $(DESTDIR)$(MANPATH)/man[6n]/xbl.[6n]
@echo "Type xbl to play"
bl:$(OBJ)
--- configure
+++ configure
@@ -764,7 +764,7 @@
test -f /usr/local/X11R7/lib/libX11.a && LI="/usr/local/X11R7/lib/libX11.a"
cat <<'EOF' >Imakefile
ALL:
- @echo CFLA=\"$(CFLAGS)\"
+ @echo CFLA=\'$(CFLAGS)\'
@echo LI=\"$(XLIB) $(LDLI)\"
@echo XAPPLOADDIR=\"RESOURCEDIR=$(XAPPLOADDIR)\"
@echo BINDIR=\"BINDIR=$(BINDIR)\"
@@ -777,7 +777,7 @@
@echo CC=\"$(CC)\"
@echo LDOPTIONS=\"$(LDOPTIONS)\"
@echo LINT=\"LINT=$(LINT)\"
- @echo LINTFLAGS=\"LINTFLAGS=$(LINTFLAGS)\"
+ @echo LINTFLAGS=\'LINTFLAGS=$(LINTFLAGS)\'
EOF
# Extract the first word of "xmkmf", so it can be a program name with args.
set dummy xmkmf; ac_word=$2
--- configure.in
+++ configure.in
@@ -33,7 +33,7 @@
dnl
cat <<'EOF' >Imakefile
ALL:
- @echo CFLA=\"$(CFLAGS)\"
+ @echo CFLA=\'$(CFLAGS)\'
@echo LI=\"$(XLIB) $(LDLI)\"
@echo XAPPLOADDIR=\"RESOURCEDIR=$(XAPPLOADDIR)\"
@echo BINDIR=\"BINDIR=$(BINDIR)\"
@@ -46,7 +46,7 @@
@echo CC=\"$(CC)\"
@echo LDOPTIONS=\"$(LDOPTIONS)\"
@echo LINT=\"LINT=$(LINT)\"
- @echo LINTFLAGS=\"LINTFLAGS=$(LINTFLAGS)\"
+ @echo LINTFLAGS=\'LINTFLAGS=$(LINTFLAGS)\'
EOF
dnl
dnl