--- deliantra/server/lib/Makefile.am	2007/03/05 19:54:49	1.23
+++ deliantra/server/lib/Makefile.am	2007/03/06 19:02:35	1.24
@@ -22,18 +22,19 @@
 pkgconfdir = @pkgconfdir@
 
 dist_noinst_SCRIPTS = collect.pl util.pl checkarch.pl
-dist_pkgdata_DATA = artifacts def_help formulae messages races \
+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
 
-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.bld
+pmdir = $(pkgdatadir)/cf
+dist_pm_DATA = cf/pod.pm
+
+admdir = $(pkgdatadir)/adm
+dist_adm_DATA = adm/map_info adm/map_expand.pl adm/mapslitter.pl adm/archsearch.pl adm/collect_images.pl
 
-admdir=$(pkgdatadir)/adm
-dist_adm_SCRIPTS =  \
-	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
 
 MAINTAINERCLEANFILES = animations archetypes bmaps bmaps.paths crossfire.0 faces treasures.bld smooth .collect-stamp Makefile.in
 
@@ -69,34 +70,24 @@
 
 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 \
 	    if [ ! -f $(DESTDIR)$(pkgconfdir)/$$i ]; then \
 		    echo "Installing $$i"; \
 		    $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(pkgconfdir); \
 	    fi \
 	done
-
-	$(mkinstalldirs) $(DESTDIR)$(pkgstatedir)
+	$(mkinstalldirs) -m 755 $(DESTDIR)$(pkgstatedir)
 	for i in $(VAR_FILES) ; do \
 		touch $(DESTDIR)$(pkgstatedir)/$$i ; \
 	done
-
-	@for i in datafiles players unique-items template-maps maps; do \
+	@for i in datafiles players unique-items template-maps maps random db tmp; do \
 	    if [ ! -d $(DESTDIR)$(pkgstatedir)/$$i ]; then \
 		echo "Creating directory $(pkgstatedir)/$$i"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgstatedir)/$$i; \
+		$(mkinstalldirs) -m 755 $(DESTDIR)$(pkgstatedir)/$$i; \
 	    fi; \
 	done
-# Special case above because the name we install to is different
-# than the name of the file
-	if [ ! -d $(DESTDIR)$(pkgdatadir)/$$i ]; then \
-		echo "Creating directory $(pkgdatadir)/$$i"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$$i; \
-	fi; \
 	$(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
 uninstall-local: