Commit 6886d9ba authored by Jon Turney's avatar Jon Turney Committed by Alan Coopersmith

Use EXEEXT_FOR_BUILD for makekeys

Use EXEXT_FOR_BUILD, to fix cross-compiling where EXEEXT differs from
EXEEXT_FOR_BUILD, such as when building for Windows from unix.

(Note: As written, this assumes EXEEXT_FOR_BUILD is always empty when
cross-compiling.  There could be some elaborate autodetection for
EXEXT_FOR_BUILD, but for the moment, if you are cross-compiling from
Windows to Unix, you'll need to set EXEEXT_FOR_BUILD explicity...)
parent a121b7b0
...@@ -65,6 +65,14 @@ if test x"$LDFLAGS_FOR_BUILD" = x; then ...@@ -65,6 +65,14 @@ if test x"$LDFLAGS_FOR_BUILD" = x; then
fi fi
AC_SUBST(LDFLAGS_FOR_BUILD) AC_SUBST(LDFLAGS_FOR_BUILD)
if test x"$EXEEXT_FOR_BUILD" = x; then
if test x"$cross_compiling" = xno; then
EXEEXT_FOR_BUILD=${EXEEXT}
fi
# If cross-compiling and not provided, assume EXEEXT_FOR_BUILD is empty
fi
AC_SUBST([EXEEXT_FOR_BUILD])
# Checks for pkg-config packages # Checks for pkg-config packages
# Always required # Always required
......
...@@ -413,9 +413,9 @@ endif MAKE_LINT_LIB ...@@ -413,9 +413,9 @@ endif MAKE_LINT_LIB
KEYSYMDEFS=@KEYSYMDEFS@ KEYSYMDEFS=@KEYSYMDEFS@
ks_tables.h: $(KEYSYMDEFS) $(top_builddir)/src/util/makekeys$(EXEEXT) ks_tables.h: $(KEYSYMDEFS) $(top_builddir)/src/util/makekeys$(EXEEXT_FOR_BUILD)
$(top_builddir)/src/util/makekeys $(KEYSYMDEFS) > ks_tables_h $(top_builddir)/src/util/makekeys $(KEYSYMDEFS) > ks_tables_h
mv ks_tables_h $@ mv ks_tables_h $@
$(top_builddir)/src/util/makekeys$(EXEEXT): $(top_builddir)/src/util/makekeys.c $(top_builddir)/src/util/makekeys$(EXEEXT_FOR_BUILD): $(top_builddir)/src/util/makekeys.c
cd util && $(MAKE) cd util && $(MAKE)
...@@ -12,6 +12,7 @@ CPPFLAGS = @CPPFLAGS_FOR_BUILD@ ...@@ -12,6 +12,7 @@ CPPFLAGS = @CPPFLAGS_FOR_BUILD@
CFLAGS = @CFLAGS_FOR_BUILD@ CFLAGS = @CFLAGS_FOR_BUILD@
LDFLAGS = @LDFLAGS_FOR_BUILD@ LDFLAGS = @LDFLAGS_FOR_BUILD@
LIBS = LIBS =
EXEEXT = @EXEEXT_FOR_BUILD@
EXTRA_DIST = mkks.sh EXTRA_DIST = mkks.sh
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment