--- deliantra/server/Makefile.am	2016/11/18 03:30:08	1.32
+++ deliantra/server/Makefile.am	2016/11/18 03:53:34	1.34
@@ -22,17 +22,24 @@
 # The authors can be reached via e-mail to <support@deliantra.net>
 #
 
-SUBDIRS = include lib ext utils doc
+pkgstatedir = @pkgstatedir@
+pkgconfdir = @pkgconfdir@
+PERL = @PERL@
+
+SUBDIRS = include lib
 
 EXTRA_DIST = AUTHORS Changes COPYING.GNU COPYING.Affero autogen.sh TODO \
              common/README \
              socket/README \
              random_maps/Notes \
-             server/typemap server/genacc server/genconst
+             server/typemap server/genacc server/genconst \
+             utils/metaserver.pl.in utils/player_dl.pl.in utils/player_dl.html utils/cfutil.in \
+             doc/historic doc/development \
+             ext/*.pm ext/*.ext
 
 CLEANFILES = server/const_iv.h server/perlxsi.c
 
-MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure Makefile
+MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure Makefile utils/cfutil utils/Makefile.in
 
 DISTCHECK_CONFIGURE_FLAGS = --localstatedir=$$dc_install_base/var --mandir=$$dc_install_base/man
 
@@ -42,9 +49,11 @@
 
 #############################################################################
 
-bin_PROGRAMS = server/deliantra-server
+bin_PROGRAMS = server/deliantra-server utils/cfhq2xa
+nodist_bin_SCRIPTS = utils/cfutil
 
 #############################################################################
+# server/, socket/, common/, random_maps/
 
 server_deliantra_server_LDFLAGS=
 server_deliantra_server_LDADD = $(LIBDL) $(PERLLIB)
@@ -168,8 +177,7 @@
                 $(abs_top_srcdir)/server/cfperl.xs >cfperl.C~ && mv cfperl.C~ cfperl.C
 
 #############################################################################
-
-pkgstatedir = @pkgstatedir@
+# pod/
 
 poddir=$(pkgdatadir)/pod
 dist_pod_DATA = pod/command_help.pod pod/dmcommand_help.pod pod/emote_help.pod pod/books.pod pod/generic_help.pod
@@ -177,6 +185,41 @@
 dist_noinst_DATA = pod/events.pod
 
 #############################################################################
+# utils/
+
+utils_cfhq2xa_SOURCES = utils/cfhq2xa.C
+
+#############################################################################
+# doc/
+
+dist-hook:
+	rm -rf `find $(distdir)/doc -name CVS`
+
+#############################################################################
+# ext/
+
+OLDEXT = 00_map_handling.ext cfplus_build.ext clientchk.ext db-scheduler.ext \
+         guildrules.ext map-prefetch.ext schmorp-clientchk.ext schmorp.irc.ext slag_ex.ext
+
+PERL = @PERL@
+
+install-data-local:
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/ext
+	for i in $(srcdir)/ext/*.pm $(srcdir)/ext/*.ext; do \
+		$(INSTALL_DATA) "$$i" $(DESTDIR)$(pkgdatadir)/ext; \
+	done
+	(cd $(DESTDIR)$(pkgdatadir)/ext/ && rm -f $(OLDEXT))
+
+# Uninstall unchanged config/var files so make distcheck is happy
+# but leave changed file, so no configuration/game state is lost
+uninstall-local:
+	-cd $(srcdir)/ext && \
+	for i in *.pm *.ext; do \
+		rm -f $(DESTDIR)$(pkgdatadir)/ext/"$$i"; \
+	done
+
+#############################################################################
 
 tags: ctags