--- deliantra/server/lib/Makefile.am	2006/04/23 04:58:13	1.4
+++ deliantra/server/lib/Makefile.am	2007/01/20 22:09:52	1.20
@@ -21,39 +21,20 @@
 #   along with this program; if not, write to the Free Software
 #   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #
-#   The authors can be reached via e-mail to crossfire-devel@real-time.com
+#   The authors can be reached via e-mail to crossfire@schmorp.de
 
 pkgstatedir = @pkgstatedir@
 pkgconfdir = @pkgconfdir@
 
 dist_noinst_SCRIPTS = collect.pl util.pl checkarch.pl
-dist_pkgdata_DATA = artifacts def_help formulae  messages races smooth\
+dist_pkgdata_DATA = artifacts def_help formulae  messages races \
 	animations archetypes  bmaps bmaps.paths crossfire.0 \
-	crossfire.1 faces attackmess image_info materials regions cf.pm
+	faces attackmess image_info smooth materials cf.pm jeweler.yaml \
+	world.pst
 
-CONF_FILES = settings motd dm_file forbid ban_file exp_table news rules
+CONF_FILES = settings motd dm_file forbid ban_file exp_table news rules config
 VAR_FILES = highscore banish_file bookarch temp.maps clockdata
-EXTRA_DIST = README .collect-stamp $(CONF_FILES) treasures treasures.bld
-
-helpdir=$(pkgdatadir)/help
-dist_help_DATA = help/apply help/applymode \
-	help/bind help/bowmode help/brace \
-	help/cast help/drop help/dropall \
-	help/follow help/golem help/invite \
-	help/invoke help/keys help/killpets \
-	help/listen \
-	help/mark help/melee help/mode \
-	help/mouse help/move \
-	help/output \
-	help/output-count help/output-sync \
-	help/party help/peaceful \
-	help/petmode help/pickup help/quests \
-	help/quit help/range help/rename \
-	help/save help/shout help/showpets \
-	help/sort_inventory help/spells \
-	help/statistics help/take help/traps \
-	help/unbind help/usekeys \
-	help/whereabouts
+EXTRA_DIST = README .collect-stamp $(CONF_FILES) treasures.bld world.png
 
 wizhelpdir=$(pkgdatadir)/wizhelp
 dist_wizhelp_DATA = wizhelp/abil wizhelp/addexp \
@@ -87,7 +68,7 @@
 	adm/map_info adm/map_expand.pl adm/mapslitter.pl adm/archsearch.pl \
 	adm/collect_images.pl
 
-MAINTAINERCLEANFILES = archetypes bmaps faces .collect-stamp
+MAINTAINERCLEANFILES = animations archetypes bmaps bmaps.paths crossfire.0 faces treasures.bld smooth .collect-stamp Makefile.in
 
 PERL = @PERL@
 
@@ -116,7 +97,13 @@
 bmaps.paths bmaps: .collect-stamp
 	make collect
 
-install-data-local: archetypes crossfire.0 faces animations collect.pl util.pl
+smooth: .collect-stamp
+	make collect
+
+world.pst: world.png compile_worldmap
+	$(PERL) compile_worldmap
+
+install-data-local: archetypes crossfire.0 faces animations collect.pl util.pl jeweler.yaml
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(pkgconfdir)
 	for i in $(CONF_FILES); do \
@@ -161,7 +148,7 @@
 		if test ! -f $(DESTDIR)$(pkgstatedir)/$$i ; then \
 			continue ;\
 		fi ; \
-		if test `wc -c $(DESTDIR)$(pkgstatedir)/$$i|$(AWK) '{ print $$1 }'` -eq "0" ; then \
+		if ! [ -s "$(DESTDIR)$(pkgstatedir)/$$i" ] ; then \
 			rm -f $(DESTDIR)$(pkgstatedir)/$$i ; \
 		fi ; \
 	done