# HG changeset patch
# User jwe
# Date 1127144695 0
# Node ID a921c9c17ba5aa572642d2b917d39cc950b02116
# Parent  89f5979e8552e1b4bc8aa5d56b4c3a33a8c16eeb
[project @ 2005-09-19 15:44:55 by jwe]

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-19  David Bateman  <dbateman@free.fr>
+
+	* octMakefile.in (LN_S): Change to DESTDIR before LN_S to avoid
+	lack of symlinks under mingw.
+
 2005-09-15  John W. Eaton  <jwe@octave.org>
 
 	* oct-sparse.h.in: Move to liboctave.
diff --git a/liboctave/ChangeLog b/liboctave/ChangeLog
--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-19  David Bateman  <dbateman@free.fr>
+
+	* oct-env.cc (octave_env::do_get_home_directory):
+	Also check HOMEDRIVE under mingw.
+
 2005-09-16  John W. Eaton  <jwe@octave.org>
 
 	* oct-syscalls.cc: Include lo-utils.h here.
diff --git a/liboctave/oct-env.cc b/liboctave/oct-env.cc
--- a/liboctave/oct-env.cc
+++ b/liboctave/oct-env.cc
@@ -370,7 +370,13 @@
 #if defined (__MINGW32__)
   // Maybe we are started directly from cmd.exe
   if (hd.empty ())
-    hd = do_getenv ("HOMEPATH");
+    {
+      std::string drv = do_getenv ("HOMEDRIVE");
+      if (drv.empty ())
+	hd = do_getenv ("HOMEPATH");
+      else
+	hd = drv + do_getenv ("HOMEPATH");
+    }
 #endif
 
   if (hd.empty ())
diff --git a/octMakefile.in b/octMakefile.in
--- a/octMakefile.in
+++ b/octMakefile.in
@@ -98,14 +98,14 @@
 	$(top_srcdir)/mkinstalldirs $(addprefix $(DESTDIR), $(DIRS_TO_MAKE))
 	rm -f $(DESTDIR)$(bindir)/octave-bug
 	$(INSTALL_SCRIPT) octave-bug $(DESTDIR)$(bindir)/octave-bug-$(version)
-	$(LN_S) octave-bug-$(version) $(DESTDIR)$(bindir)/octave-bug
+	(cd $(DESTDIR)$(bindir); $(LN_S) octave-bug-$(version) $(DESTDIR)$(bindir)/octave-bug)
 	rm -f $(DESTDIR)$(bindir)/octave-config
 	$(INSTALL_SCRIPT) \
 	  octave-config $(DESTDIR)$(bindir)/octave-config-$(version)
-	$(LN_S) octave-config-$(version) $(DESTDIR)$(bindir)/octave-config
+	(cd $(DESTDIR)$(bindir); $(LN_S) octave-config-$(version) $(DESTDIR)$(bindir)/octave-config)
 	rm -f $(DESTDIR)$(bindir)/mkoctfile
 	$(INSTALL_SCRIPT) mkoctfile $(DESTDIR)$(bindir)/mkoctfile-$(version)
-	$(LN_S) mkoctfile-$(version) $(DESTDIR)$(bindir)/mkoctfile
+	(cd $(DESTDIR)$(bindir); $(LN_S) mkoctfile-$(version) $(DESTDIR)$(bindir)/mkoctfile)
 	$(INSTALL_DATA) config.h $(DESTDIR)$(octincludedir)/octave/config.h
 
 uninstall::