--- deliantra/server/lib/Makefile.am	2007/03/06 19:02:35	1.24
+++ deliantra/server/lib/Makefile.am	2007/11/08 19:43:25	1.34
@@ -1,30 +1,31 @@
-#   Copyright (C) 2007 Marc Alexander Lehmann
-#   Copyright (C) 2001 Mark Wedel & Crossfire Development Team
-#   Copyright (C) 1992 Frank Tore Johansen
 #
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 2 of the License, or
-#   (at your option) any later version.
+# This file is part of Deliantra, the Roguelike Realtime MMORPG.
+# 
+# Copyright (©) 2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+# Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
+# Copyright (©) 1992,2007 Frank Tore Johansen
+# 
+# Deliantra is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# 
+# The authors can be reached via e-mail to <support@deliantra.net>
 #
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   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@schmorp.de
 
 pkgstatedir = @pkgstatedir@
 pkgconfdir = @pkgconfdir@
 
-dist_noinst_SCRIPTS = collect.pl util.pl checkarch.pl
-nobase_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
+nobase_dist_pkgdata_DATA = artifacts formulae races \
+	attackmess materials cf.pm jeweler.yaml
 
 pmdir = $(pkgdatadir)/cf
 dist_pm_DATA = cf/pod.pm
@@ -32,44 +33,18 @@
 admdir = $(pkgdatadir)/adm
 dist_adm_DATA = adm/map_info adm/map_expand.pl adm/mapslitter.pl adm/archsearch.pl adm/collect_images.pl
 
-CONF_FILES = settings motd dm_file forbid exp_table news rules config
-VAR_FILES = highscore bookarch temp.maps clockdata
-EXTRA_DIST = README .collect-stamp $(CONF_FILES) treasures.bld
+CONF_FILES = settings motd dm_file exp_table news rules config
+VAR_FILES = highscore bookarch temp.maps
+EXTRA_DIST = README $(CONF_FILES)
 
-MAINTAINERCLEANFILES = animations archetypes bmaps bmaps.paths crossfire.0 faces treasures.bld smooth .collect-stamp Makefile.in
+MAINTAINERCLEANFILES = Makefile.in
 
 PERL = @PERL@
 
-crossfire.0: bmaps.paths
-	$(PERL) $(srcdir)/adm/collect_images.pl -png
-
-.collect-stamp:
-	touch .collect-stamp
-
-collect:
-	$(PERL) -I$(srcdir) collect.pl $(srcdir)/arch
-	$(PERL) $(srcdir)/adm/collect_images.pl -png
-
-archonly:
-	$(PERL) -I$(srcdir) collect.pl $(srcdir)/arch ARCHONLY
-
-archetypes: .collect-stamp
-	make collect
-
-faces: .collect-stamp
-	make collect
-
-animations: .collect-stamp
-	make collect
-
-bmaps.paths bmaps: .collect-stamp
-	make collect
-
-smooth: .collect-stamp
-	make collect
-
-install-data-local: archetypes crossfire.0 faces animations collect.pl util.pl jeweler.yaml
+install-data-local: jeweler.yaml
 	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) -m 755 $(DESTDIR)$(pkgdatadir)/maps
+	$(mkinstalldirs) -m 755 $(DESTDIR)$(pkgconfdir)
 	for i in $(CONF_FILES); do \
 	    if [ ! -f $(DESTDIR)$(pkgconfdir)/$$i ]; then \
 		    echo "Installing $$i"; \
@@ -86,7 +61,6 @@
 		$(mkinstalldirs) -m 755 $(DESTDIR)$(pkgstatedir)/$$i; \
 	    fi; \
 	done
-	$(INSTALL_DATA) $(srcdir)/treasures.bld $(DESTDIR)$(pkgdatadir)/treasures
 
 # Uninstall unchanged config/var files so make distcheck is happy
 # but leave changed file, so no configuration/game state is lost
@@ -109,13 +83,3 @@
 	done
 
 
-# This block makes the archive of the arch directory.
-archive::
-	$(AMTAR) -cvh --exclude=dev --exclude=CVS -f $(PACKAGE)-$(VERSION)-arch.tar arch
-	$(GZIP) -cv9 $(PACKAGE)-$(VERSION)-arch.tar > ../$(PACKAGE)-$(VERSION)-arch.tar.gz
-	$(BZIP) -cv --repetitive-best $(PACKAGE)-$(VERSION)-arch.tar > ../$(PACKAGE)-$(VERSION)-arch.tar.bz2
-	$(RM) $(PACKAGE)-$(VERSION)-arch.tar
-
-libArch:
-	tar cvf A`perl puredate.pl`.tar arch treasures
-	gzip A`perl puredate.pl`.tar