* lily/relocate.cc (setup_paths) [__MINGW32__]: Comment-out broken

relocation code.

* stepmake/stepmake/generic-vars.make (INSTALL): Assign INSTALL_PY
iso itself.

* lily/relocate.cc [HAVE_GETTEXT]: Include libintl.h.  Fixes mingw
compile.

diff --git a/ChangeLog b/ChangeLog
index 8384ebce70d8c81c398d1a5e40543cf4dc413a85..59cdcfc325b834453a356368aa7b65eb3e0c202f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-12-21  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * lily/relocate.cc (setup_paths) [__MINGW32__]: Comment-out broken
+       relocation code.
+
        * stepmake/stepmake/generic-vars.make (INSTALL): Assign INSTALL_PY
        iso itself.
 

diff --git a/config.make.in b/config.make.in
index 95e725135edd3a9e8254aa50292c08322a40a5b1..bc3c1363fb722ea752ed29dcc8e80e3a61c25be2 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -80,6 +80,7 @@ lilypond_omfdir = $(local_package_omfdir)
 webdir = $(lilypond_docdir)/html
 vimdir = $(lilypond_datadir)/vim
 
+AR = @AR@
 BASH = @BASH@
 BISON = @BISON@
 CC = @CC@
@@ -102,6 +103,7 @@ GUILE_LDFLAGS = @GUILE_LDFLAGS@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
 INIMETAFONT = @INIMETAFONT@
+INSTALL = @INSTALL@
 KPATHSEA_LIBS = @KPATHSEA_LIBS@
 LD = @LD@
 LINK_GXX_STATICALLY = @LINK_GXX_STATICALLY@
@@ -119,6 +121,7 @@ PERL = @PERL@
 PLATFORM_WINDOWS = @PLATFORM_WINDOWS@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
+RANLIB = @RANLIB@
 ROOTSEP = @ROOTSEP@
 SHELL = @SHELL@
 SPLITTING_MAKEINFO = @SPLITTING_MAKEINFO@
@@ -126,5 +129,3 @@ TAR = @TAR@
 WINDRES = @WINDRES@
 YACC = @YACC@
 ZIP = @ZIP@
-AR = @AR@
-RANLIB = @RANLIB@

diff --git a/lily/relocate.cc b/lily/relocate.cc
index 16a76dfd48309c31b5588cd4c3121c6485177f62..0c241aeea72037c585070e240a1607fcaf252a02 100644 (file)
--- a/lily/relocate.cc
+++ b/lily/relocate.cc
@@ -161,6 +161,15 @@ setup_paths (char const *argv0)
 #endif /* __CYGWIN__ || __MINGW32__ */
 
 
+#ifndef __MINGW32__
+
+      /* FIXME, this is broken.
+       what is this supposed to do?
+
+       argv0[0]==/ is not a universal test for absolute files, see
+       below for File_name.dir_[0] .
+      */
+
       /* if name contains slashes, we should not look in $PATH */
       String argv0_abs;
       if (argv0[0] == '/')
@@ -168,6 +177,7 @@ setup_paths (char const *argv0)
       else if (String (argv0).index ('/') > 0)
        argv0_abs = get_working_directory () + "/" + String (argv0);
       else
+#endif
        {
          /* Find absolute ARGV0 name, using PATH.  */
          File_path path;

diff --git a/stepmake/stepmake/generic-vars.make b/stepmake/stepmake/generic-vars.make
index 2a6cf327a747b85f858db4662f7f37af3d297e6d..f41d2b415b3f2b761a8dac3e0233ac4c238282b3 100644 (file)
--- a/stepmake/stepmake/generic-vars.make
+++ b/stepmake/stepmake/generic-vars.make
@@ -39,6 +39,7 @@ step-bindir = $(stepmake)/bin
 DEPTH = $(depth)/$(package-depth)
 
 INSTALLPY=$(PYTHON) $(step-bindir)/install.py -c
+## FIXME, use INSTALLPY or INSTALL from config.make?
 INSTALL=$(INSTALLPY)
 
 group-dir = $(shell cd $(DEPTH);pwd)/..