--- deliantra/server/Makefile.am	2016/11/17 23:28:04	1.30
+++ deliantra/server/Makefile.am	2016/11/18 03:21:36	1.31
@@ -143,13 +143,13 @@
 
 SUFFIXES = .xs
 
-CONST_SRC = include/define.h include/spells.h include/attack.h \
-            include/skills.h include/material.h include/sounds.h \
-            include/object.h include/treasure.h include/client.h \
-            include/logger.h include/rmg.h include/map.h
+CONST_SRC = $(top_srcdir)/include/define.h $(top_srcdir)/include/spells.h   $(top_srcdir)/include/attack.h \
+            $(top_srcdir)/include/skills.h $(top_srcdir)/include/material.h $(top_srcdir)/include/sounds.h \
+            $(top_srcdir)/include/object.h $(top_srcdir)/include/treasure.h $(top_srcdir)/include/client.h \
+            $(top_srcdir)/include/logger.h $(top_srcdir)/include/rmg.h      $(top_srcdir)/include/map.h
 
 server/const_iv.h: server/genconst $(CONST_SRC)
-	$(PERL) server/genconst $(CONST_SRC) >$@~ && mv $@~ $@
+	$(PERL) $(srcdir)/server/genconst $(CONST_SRC) >$@~ && mv $@~ $@
 
 server/cfperl.C: server/cfperl.xs server/typemap server/genacc
 server/cfperl.C: server/const_iv.h
@@ -161,7 +161,11 @@
 .xs.C: server/typemap
 	cd server || exit 1; \
         $(PERL) -MExtUtils::Embed -e xsinit -- -std cf; \
-	PERL="$(PERL)" srcdir="$(srcdir)" $(PERL) @PERLPRIVLIBEXP@/ExtUtils/xsubpp -C++ -csuffix .C -typemap @PERLPRIVLIBEXP@/ExtUtils/typemap -typemap typemap -prototypes $(abs_top_srcdir)/server/cfperl.xs >cfperl.C~ && mv cfperl.C~ cfperl.C
+	PERL="$(PERL)" srcdir="$(abs_top_srcdir)/server" \
+		$(PERL) @PERLPRIVLIBEXP@/ExtUtils/xsubpp \
+	        -C++ -csuffix .C \-typemap @PERLPRIVLIBEXP@/ExtUtils/typemap \
+                -typemap typemap -prototypes \
+                $(abs_top_srcdir)/server/cfperl.xs >cfperl.C~ && mv cfperl.C~ cfperl.C
 
 #############################################################################