X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flanguage%2Fexpressions%2Fautomake.mk;h=0ff62645c6d9b8e12984e634221e36614fea13e6;hb=6640b245f84dfcf03f8109dc99b3c7b73f8831d1;hp=5039c12247d683fc5e195182ea1df315724b5214;hpb=691a034d7f2139076fa012739dffd40ef5db4a9b;p=pspp

diff --git a/src/language/expressions/automake.mk b/src/language/expressions/automake.mk
index 5039c12247..0ff62645c6 100644
--- a/src/language/expressions/automake.mk
+++ b/src/language/expressions/automake.mk
@@ -1,19 +1,19 @@
 # PSPP - a program for statistical analysis.
 # Copyright (C) 2017 Free Software Foundation, Inc.
-# 
+#
 # 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 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/>.
-# 
+#
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
 language_expressions_sources = \
@@ -35,15 +35,19 @@ expressions_built_sources = \
 BUILT_SOURCES += $(expressions_built_sources)
 CLEANFILES += $(expressions_built_sources)
 
-helpers = src/language/expressions/generate.pl \
+helpers = src/language/expressions/generate.py \
 	src/language/expressions/operations.def
 EXTRA_DIST += $(helpers)
 
 $(expressions_built_sources): $(helpers)
 	$(AV_V_GEN)$(MKDIR_P) `dirname $@` && \
-	$(PERL) $< -o $@ -i $(top_srcdir)/src/language/expressions/operations.def
+	$(PYTHON3) $< -o $@ -i $(top_srcdir)/src/language/expressions/operations.def
 
-AM_CPPFLAGS += -I$(top_builddir)/src/language/expressions \
-	-I$(top_srcdir)/src/language/expressions
+AM_CPPFLAGS += -I"$(abs_top_builddir)/src/language/expressions" \
+	-I"$(top_srcdir)/src/language/expressions"
 
 EXTRA_DIST += src/language/expressions/TODO
+
+# This seems to be necessary in order to prevent issues building the native
+# build when cross compiling
+src/language/expressions/evaluate.lo: $(expressions_built_sources)