$NetBSD: patch-aa,v 1.5 2000/08/23 21:57:58 tron Exp $ --- Makefile.inc.orig Thu Jun 29 02:28:14 2000 +++ Makefile.inc Wed Aug 23 23:39:29 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= @@ -45,13 +45,13 @@ # For NetBSD, use: # ------------------------ -# 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: # --------------------------------- @@ -114,12 +114,12 @@ # DOCDIR contains documentation BINDIR=${MOSMLHOME}/bin -LIBDIR=${MOSMLHOME}/lib -INCDIR=${MOSMLHOME}/include -DOCDIR=${MOSMLHOME}/doc -TOOLDIR=${MOSMLHOME}/tools -# LIBDIR=${MOSMLHOME}/lib/moscow_ml -# TOOLDIR=${MOSMLHOME}/libexec/moscow_ml +#LIBDIR=${MOSMLHOME}/lib +INCDIR=${MOSMLHOME}/include/moscow_ml +DOCDIR=${MOSMLHOME}/share/doc/moscow_ml +#TOOLDIR=${MOSMLHOME}/tools +LIBDIR=${MOSMLHOME}/lib/moscow_ml +TOOLDIR=${MOSMLHOME}/libexec/moscow_ml CAMLRT=../runtime