--- deliantra/server/lib/Makefile.am	2006/07/15 13:02:11	1.11
+++ deliantra/server/lib/Makefile.am	2007/03/05 19:54:49	1.23
@@ -1,9 +1,4 @@
-#
-# Makefile for crossfire 0.95.0 and beyond
-#
-# This file will eventually be replaced by a configure script.  But for
-# now, this simple makefile should do the job.
-#
+#   Copyright (C) 2007 Marc Alexander Lehmann
 #   Copyright (C) 2001 Mark Wedel & Crossfire Development Team
 #   Copyright (C) 1992 Frank Tore Johansen
 #
@@ -21,65 +16,19 @@
 #   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 \
-	animations archetypes  bmaps bmaps.paths crossfire.0 \
-	faces attackmess image_info smooth materials regions cf.pm jeweler.yaml
+dist_pkgdata_DATA = artifacts def_help formulae messages races \
+	animations archetypes bmaps bmaps.paths crossfire.0 \
+	faces attackmess image_info smooth materials cf.pm jeweler.yaml
 
-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/chat help/drop help/dropall \
-	help/follow help/golem help/ignore \
-	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/reply help/save \
-	help/shout help/showpets help/sort_inventory \
-	help/spells help/statistics help/take \
-	help/tell help/traps help/unbind \
-	help/unignore help/usekeys help/whereabouts
-
-wizhelpdir=$(pkgdatadir)/wizhelp
-dist_wizhelp_DATA = wizhelp/abil wizhelp/addexp \
-	wizhelp/banish \
-	wizhelp/create wizhelp/debug \
-	wizhelp/dump wizhelp/dumpallarchtypes \
-	wizhelp/dumpallmaps wizhelp/dumpallobjects \
-	wizhelp/dumpbelow wizhelp/dumpfriendlyobjects \
-	wizhelp/forget_spell wizhelp/free \
-	wizhelp/goto wizhelp/hide wizhelp/insert_into \
-	wizhelp/invisible \
-	wizhelp/kick wizhelp/learn_special_prayer \
-	wizhelp/learn_spell wizhelp/mon_aggr \
-	wizhelp/nodm \
-	wizhelp/nowiz wizhelp/overlay_save \
-	wizhelp/patch wizhelp/plugin \
-	wizhelp/pluglist wizhelp/plugout \
-	wizhelp/possess \
-	wizhelp/printlos wizhelp/remove \
-	wizhelp/reset wizhelp/set_god \
-	wizhelp/shutdown wizhelp/server_speed \
-	wizhelp/spellreset wizhelp/ssdumptable wizhelp/stats \
-	wizhelp/style_info wizhelp/summon \
-	wizhelp/teleport wizhelp/time \
-	wizhelp/toggle_shout \
-	wizhelp/who wizhelp/wizcast wizhelp/wizhelp \
-	wizhelp/wizpass
+EXTRA_DIST = README .collect-stamp $(CONF_FILES) treasures.bld
 
 admdir=$(pkgdatadir)/adm
 dist_adm_SCRIPTS =  \
@@ -118,7 +67,7 @@
 smooth: .collect-stamp
 	make collect
 
-install-data-local: archetypes crossfire.0 faces animations collect.pl util.pl
+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 \
@@ -163,7 +112,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