pkg://xsok-1.02-8.src.rpm:118461/xsok-1.02.patch
info downloads
--- ./src/Imakefile.orig Sun Mar 17 12:54:27 1996
+++ ./src/Imakefile Wed Jun 24 08:35:26 1998
@@ -44,19 +44,19 @@
SLEEP_DEFINE = -DHAVE_USLEEP
# BINDIR and LIBDIR should be predefined by the templates
-# BINDIR = /usr/bin/X11
-# LIBDIR = /usr/lib/X11
-XSOKLIBDIR = /usr/games/lib/xsok
-APPDEFSDIR = $(LIBDIR)
-XSOKMANDIR = /usr/man/man6
-XSOKDOCDIR = /usr/doc/xsok
+#BINDIR = /usr/X11R6/bin
+#LIBDIR = /usr/X11R6/lib/X11
+XSOKLIBDIR = $(DESTDIR)/usr/X11R6/lib/X11/xsok
+APPDEFSDIR = $(LIBDIR)
+XSOKMANDIR = $(DESTDIR)/usr/X11R6/man/man6
+XSOKDOCDIR = $(DESTDIR)/usr/doc/xsok
# This is the name of the save directory, where solved games are stored:
# an alternative path would be $(XSOKLIBDIR)/save
# The directory XSOKSAVEDIR must have permissions rwx for world, else
# xsok must be installed suid, and XSOKDIR must have write permissions for
# the owner of xsok
-XSOKSAVEDIR = /var/games/xsok
+XSOKSAVEDIR = $(DESTDIR)/var/lib/games/xsok
# paths for installation in user's home-directory.
LXSOKBINDIR = $(HOME)/bin
@@ -64,8 +64,8 @@
LAPPDEFSDIR = $(HOME)
# xsok needs to know where the xpm library resides
-XPMLIB = -L$(USRLIBDIR) -lXpm
-XPMINCLUDE = -I $(INCDIR)
+XPMLIB = -L$(USRLIBDIR) -L/usr/X11R6/lib -lXpm
+XPMINCLUDE = -I$(INCDIR) -I/usr/X11R6/include/X11
# *****************************************************************************
# I hope you don't need to change anything below this point
@@ -81,7 +81,7 @@
-Wstrict-prototypes -Wmissing-prototypes \
-Wnested-externs -Wwrite-strings
#else
-CCOPTIONS = -O2 -pipe -ansi -Wall -fno-common
+CCOPTIONS = $(RPM_OPT_FLAGS) -pipe -ansi -Wall -fno-common
#endif
#endif
@@ -137,7 +137,6 @@
(umask 022 && mkdirhier $(XSOKSAVEDIR))
chmod 777 $(XSOKSAVEDIR)
(cd ../lib; tar cf - $(LIBCONTS) | (cd $(XSOKLIBDIR); tar xf -))
- chown -R root $(XSOKLIBDIR) $(XSOKSAVEDIR)
chmod -R a+r $(XSOKLIBDIR)
(cd ../lib && ../src/mergescores $(XSOKSAVEDIR)/Xsok.score \
$(XSOKSAVEDIR)/Sokoban.score $(XSOKSAVEDIR)/Cyberbox.score)
