diff --git a/src/modules/Gmp/Makefile.in b/src/modules/Gmp/Makefile.in
index 761fee43d84924f8fca1fbf796d550cf1b6c7a23..04dad43a023605dec7b9b2bb101bba9a7a7b4261 100644
--- a/src/modules/Gmp/Makefile.in
+++ b/src/modules/Gmp/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.12 2000/08/01 21:53:22 grubba Exp $
+# $Id: Makefile.in,v 1.13 2000/08/01 23:02:18 grubba Exp $
 @make_variables@
 VPATH=@srcdir@:@srcdir@/../..:../..
 MODULE_LDFLAGS=@LDFLAGS@ @LIBS@
@@ -12,14 +12,19 @@ CONFIG_HEADERS=@CONFIG_HEADERS@
 
 next_prime.o: prime_table.out
 
-prime_table.out: prime_table@CROSS@
-	./prime_table@CROSS@ $(PRIME_LIMIT) >prime_table.out
+prime_table.out: prime_table
+	./prime_table $(PRIME_LIMIT) >prime_table.out
 
-prime_table: $(SRCDIR)/prime_table.c
-	$(CC) $(CFLAGS) $(SRCDIR)/prime_table.c -o prime_table
+prime_table: prime_table.@CROSS@
+	test -f ./prime_table || ln -s prime_table.@CROSS@ ./prime_table
 
-prime_table.pike: $(SRCDIR)/prime_table.pike
-	test -f prime_table.pike || ln -s $(SRCDIR)/prime_table.pike
+# Not cross-compiling
+prime_table.no: $(SRCDIR)/prime_table.c
+	$(CC) $(CFLAGS) $(SRCDIR)/prime_table.c -o prime_table.no
+
+# Cross-compiling
+prime_table.yes: $(SRCDIR)/prime_table.pike
+	test -f ./prime_table.yes || ln -s $(SRCDIR)/prime_table.pike ./prime_table.yes
 
 depend: prime_table.out
 
diff --git a/src/modules/Gmp/configure.in b/src/modules/Gmp/configure.in
index 328e90527d4b0049775142d243494aec99c42177..eadc4c542f369624adc6763831ce1fe7a3fa077c 100644
--- a/src/modules/Gmp/configure.in
+++ b/src/modules/Gmp/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.14 2000/08/01 21:37:47 grubba Exp $
+# $Id: configure.in,v 1.15 2000/08/01 23:02:18 grubba Exp $
 AC_INIT(mpz_glue.c)
 AC_CONFIG_HEADER(gmp_machine.h)
 AC_ARG_WITH(gmp,     [  --with(out)-gmp        Support bignums],[],[with_gmp=yes])
@@ -8,10 +8,7 @@ AC_MODULE_INIT()
 
 # Check if we're cross-compiling.
 
-CROSS=""
-if test "$ac_cv_prog_cc_cross" = "yes"; then
-  CROSS=".pike"
-else :; fi
+CROSS="$ac_cv_prog_cc_cross"
 AC_SUBST(CROSS)
 
 #############################################################################