--- deliantra/server/lib/Makefile.am	2007/05/24 03:33:29	1.27
+++ deliantra/server/lib/Makefile.am	2010/05/05 23:23:29	1.43
@@ -1,46 +1,50 @@
-#   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,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+# Copyright (©) 2001 Mark Wedel & Crossfire Development Team
+# Copyright (©) 1992 Frank Tore Johansen
+# 
+# Deliantra is free software: you can redistribute it and/or modify it under
+# the terms of the Affero 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 Affero GNU General Public License
+# and 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 races \
-	attackmess materials cf.pm jeweler.yaml
+nobase_dist_pkgdata_DATA = cf.pm
 
 pmdir = $(pkgdatadir)/cf
-dist_pm_DATA = cf/pod.pm
+dist_pm_DATA = cf/pod.pm cf/match.pm cf/mapscript.pm cf/incloader.pm
 
 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
+CONF_FILES = settings dm_file config
 VAR_FILES = highscore bookarch temp.maps
-EXTRA_DIST = README .collect-stamp $(CONF_FILES)
+EXTRA_DIST = README $(CONF_FILES)
 
-MAINTAINERCLEANFILES = .collect-stamp Makefile.in
+MAINTAINERCLEANFILES = Makefile.in
 
 PERL = @PERL@
 
-install-data-local: jeweler.yaml
+install-data-local:
 	@$(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"; \