SOURCES: stone_soup-makefile.patch (NEW), stone_soup-systemlua.patch (NEW) ...

[agaran]

Author: agaran                       Date: Fri Aug 29 23:03:24 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- stonesoup fixes, spec in way

---- Files affected:
SOURCES:
   stone_soup-makefile.patch (NONE -> 1.1)  (NEW), stone_soup-systemlua.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/stone_soup-makefile.patch
diff -u /dev/null SOURCES/stone_soup-makefile.patch:1.1
--- /dev/null	Sat Aug 30 01:03:25 2008
+++ SOURCES/stone_soup-makefile.patch	Sat Aug 30 01:03:18 2008
@@ -0,0 +1,54 @@
+diff -Nur stone_soup-0.4.1-src.ori/source/makefile.unix stone_soup-0.4.1-src/source/makefile.unix
+--- stone_soup-0.4.1-src.ori/source/makefile.unix	2008-07-20 13:40:44.689619433 +0200
++++ stone_soup-0.4.1-src/source/makefile.unix	2008-07-20 13:40:01.377123889 +0200
+@@ -44,6 +44,8 @@
+ # valid path before building Crawl. This is not necessary if you are building
+ # Crawl for a single user.
+ 
++SAVEDIR := /var/games/stone_soup/
++DATADIR := /usr/share/stone_soup/
+ # SAVEDIR := /usr/games/crawl/saves/
+ # DATADIR := /usr/games/crawl/data/
+ 
+@@ -227,29 +229,19 @@
+ ifeq ($(DATADIR),)
+ 	$(error DATADIR not set! Set DATADIR and run make clean install again)
+ endif
+-	[ -d $(INSTALLDIR) ] || mkdir -p $(INSTALLDIR)
+-	$(COPY) $(GAME) $(INSTALLDIR)
+-	chown $(INSTALL_UGRP) $(INSTALLDIR)/$(GAME)
+-	chmod ${MCHMOD} ${INSTALLDIR}/$(GAME)
+-	mkdir -p $(DATADIR)/dat
+-	mkdir -p $(DATADIR)/dat/lua
+-	mkdir -p $(DATADIR)/dat/clua
+-	mkdir -p $(DATADIR)/dat/descript
+-	mkdir -p $(DATADIR)/dat/database
+-	cp dat/*.des $(DATADIR)/dat
+-	cp dat/lua/*.lua $(DATADIR)/dat/lua
+-	cp dat/clua/*.lua $(DATADIR)/dat/clua
+-	cp dat/descript/*.txt $(DATADIR)/dat/descript
+-	cp dat/database/*.txt $(DATADIR)/dat/database
+-	mkdir -p $(DATADIR)/settings
+-	cp ../settings/* $(DATADIR)/settings/
+-	mkdir -p $(DATADIR)/docs
+-	cp ../docs/*.txt $(DATADIR)/docs
+-	chown -R $(INSTALL_UGRP) $(DATADIR)
++	install -d $(DESTDIR)/usr/bin
++	install $(GAME) $(DESTDIR)/usr/bin/stone_soup
++	install -d $(DESTDIR)$(DATADIR)dat
++	install -d $(DESTDIR)$(DATADIR)dat/{lua,clua,descript,database}
++	install dat/*.des $(DESTDIR)$(DATADIR)dat/
++	install dat/lua/*.lua $(DESTDIR)$(DATADIR)dat/lua/
++	install dat/clua/*.lua $(DESTDIR)$(DATADIR)dat/clua/
++	install dat/descript/*.txt $(DESTDIR)$(DATADIR)dat/descript/
++	install dat/database/*.txt $(DESTDIR)$(DATADIR)dat/database/
++	install -d $(DESTDIR)$(DATADIR)settings
++	install ../settings/* $(DESTDIR)$(DATADIR)settings/
+ ifneq ($(SAVEDIR),)
+-	mkdir -p $(SAVEDIR)
+-	chown $(INSTALL_UGRP) $(SAVEDIR)
+-	chmod $(MCHMOD_SAVEDIR) $(SAVEDIR)
++	install -d $(DESTDIR)$(SAVEDIR)
+ endif
+ 
+ clean:

================================================================
Index: SOURCES/stone_soup-systemlua.patch
diff -u /dev/null SOURCES/stone_soup-systemlua.patch:1.1
--- /dev/null	Sat Aug 30 01:03:25 2008
+++ SOURCES/stone_soup-systemlua.patch	Sat Aug 30 01:03:19 2008
@@ -0,0 +1,31 @@
+--- stone_soup-0.4.1-src/source/makefile.unix	2008-07-18 01:35:53.000000000 +0200
++++ stone_soup-0.4.1-src/source/makefile.unix.mod	2008-07-19 12:15:36.968770818 +0200
+@@ -50,8 +50,8 @@
+ LEX  := flex
+ YACC := bison -y
+ 
+-LUASRC := util/lua/src
+-LUALIB = lua
++LUASRC := /usr/include/lua51 
++LUALIB = lua51
+ LUALIBA = l$(LUALIB).a
+ 
+ DBH_FILE  := /usr/include/db.h
+@@ -85,7 +85,7 @@
+ EXTRA_DEPENDS  += $(FSQLLIBA)
+ endif
+ 
+-LIB = -l$(LIBCURS) -L$(LUASRC) -l$(LUALIB) $(LIBDBM)
++LIB = -l$(LIBCURS) -L/usr/lib -l$(LUALIB) $(LIBDBM)
+ 
+ INCLUDES := $(INCLUDES) -Iutil -I. -I$(LUASRC) $(EXTRA_INCLUDES)
+ 
+@@ -156,7 +156,7 @@
+ DOYACC :=
+ endif
+ 
+-GAME_DEPENDS := $(LUASRC)$(LUALIBA) $(EXTRA_DEPENDS) $(OBJECTS)
++GAME_DEPENDS := $(EXTRA_DEPENDS) $(OBJECTS)
+ SRC_PKG_BASE := stone_soup
+ SRC_VERSION  := $(shell egrep 'VER_NUM  *".*"' version.h | \
+ 			egrep -o '[0-9]\.[0-9](\.[0-9])?')
================================================================