--- ./pathnames.h~	Tue Apr  8 11:26:32 2003
+++ ./pathnames.h	Tue Apr  8 11:27:00 2003
@@ -39,7 +39,11 @@
 #define _PATH_HOST_KEY_FILE		SSHDIR "/ssh_host_key"
 #define _PATH_HOST_DSA_KEY_FILE		SSHDIR "/ssh_host_dsa_key"
 #define _PATH_HOST_RSA_KEY_FILE		SSHDIR "/ssh_host_rsa_key"
+
+#ifndef _PATH_DH_MODULI
 #define _PATH_DH_MODULI			SSHDIR "/moduli"
+#endif
+
 /* Backwards compatibility */
 #define _PATH_DH_PRIMES			SSHDIR "/primes"
 
--- ./Makefile.in~	Tue Apr  8 11:37:04 2003
+++ ./Makefile.in	Tue Apr  8 11:38:16 2003
@@ -25,6 +25,7 @@
 SFTP_SERVER=$(libexecdir)/sftp-server
 SSH_KEYSIGN=$(libexecdir)/ssh-keysign
 RAND_HELPER=$(libexecdir)/ssh-rand-helper
+DH_MODULI=$(datadir)/moduli
 PRIVSEP_PATH=@PRIVSEP_PATH@
 SSH_PRIVSEP_USER=@SSH_PRIVSEP_USER@
 STRIP_OPT=@STRIP_OPT@
@@ -35,6 +36,7 @@
 	-D_PATH_SFTP_SERVER=\"$(SFTP_SERVER)\" \
 	-D_PATH_SSH_KEY_SIGN=\"$(SSH_KEYSIGN)\" \
 	-D_PATH_SSH_PIDDIR=\"$(piddir)\" \
+	-D_PATH_DH_MODULI=\"$(DH_MODULI)\" \
 	-D_PATH_PRIVSEP_CHROOT_DIR=\"$(PRIVSEP_PATH)\" \
 	-DSSH_RAND_HELPER=\"$(RAND_HELPER)\"