--- Makefile.inc.orig	Wed Aug  4 17:40:24 1999
+++ Makefile.inc	Wed Apr  5 10:05:09 2000
@@ -2,20 +2,20 @@
 
 # Where to install stuff
 
-MOSMLHOME=${HOME}/mosml
+MOSMLHOME=${PREFIX}
 
 # Various utility programs
 INSTALL_PROGRAM=cp
 INSTALL_SCRIPT=cp
 INSTALL_DATA=cp
-PERL=perl
+PERL=${LOCALBASE}/bin/perl
 
 # To compile the runtime system camlrunm with support for
 # dynamically loadable libraries (DDLs), uncomment these:
 
 ADDPRIMS=dynlib.c
 ADDOBJS=dynlib.o
-ADDRUNLIBS=-ldl
+# ADDRUNLIBS=-ldl
 ADDRUNCFLAGS=
 ADDDYNLIBCFLAGS=
 
@@ -26,13 +26,13 @@ LD=gcc -rdynamic
 DYNLD=ld -shared
 
 # For NetBSD, use instead:
-# CPP=/usr/bin/cpp -P -traditional -Dunix -Umsdos
-# STRIP=/usr/bin/strip
-# ADDRUNCFLAGS=-fPIC
-# ADDDYNLIBCFLAGS=-fPIC
-# INSTALL_PROGRAM=${BSD_INSTALL_PROGRAM}
-# INSTALL_SCRIPT=${BSD_INSTALL_SCRIPT}
-# INSTALL_DATA=${BSD_INSTALL_DATA}
+CPP=/usr/bin/cpp -P -traditional -Dunix -Umsdos
+STRIP=/usr/bin/strip
+ADDRUNCFLAGS=-fPIC
+ADDDYNLIBCFLAGS=-fPIC
+INSTALL_PROGRAM=${BSD_INSTALL_PROGRAM}
+INSTALL_SCRIPT=${BSD_INSTALL_SCRIPT}
+INSTALL_DATA=${BSD_INSTALL_DATA}
 
 # For Solaris 2 (not SunOS 4), use instead:
 # CPP=/usr/ccs/lib/cpp -P -Dunix -Umsdos
@@ -68,10 +68,10 @@ SHELL=/bin/sh
 # LIBDIR contains bytecode files (such as mosmlcmp and library units)
 
 BINDIR=${MOSMLHOME}/bin
-LIBDIR=${MOSMLHOME}/lib
-TOOLDIR=${MOSMLHOME}/tools
-# LIBDIR=${MOSMLHOME}/lib/moscow_ml
-# TOOLDIR=${MOSMLHOME}/libexec/moscow_ml
+# LIBDIR=${MOSMLHOME}/lib
+# TOOLDIR=${MOSMLHOME}/tools
+LIBDIR=${MOSMLHOME}/lib/moscow_ml
+TOOLDIR=${MOSMLHOME}/libexec/moscow_ml
 
 CAMLRT=../runtime