Avoid collapsed directory

constructs '//'.

diff --git a/ChangeLog b/ChangeLog
index 491af502b4c8ac9b44133102d42d7791c958cebf..fe163020aab09bb68a68c84f855ff80ad77123e5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2002-05-17  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * Documentation/windows/GNUmakefile: Avoid collapsed directory
+       constructs '//'.
+       
        * stepmake/bin/install-dot-exe.sh: Filter collapsed directory
        constructs '//' from arguments.
 

diff --git a/Documentation/windows/GNUmakefile b/Documentation/windows/GNUmakefile
index 965599a12c1a311dd73b640aeb57bcedbb08dbbb..0416dff9a9b436cc9bf08180922f66989e1ffb6a 100644 (file)
--- a/Documentation/windows/GNUmakefile
+++ b/Documentation/windows/GNUmakefile
@@ -40,10 +40,12 @@ INSTALLATION_OUT_SUFFIXES=1 2
 # LilyPond on windows is configured with --prefix=/usr/lilypond-x.y.x
 # The cygwin profile.d dir, however, is in /etc
 
-INSTALLATION_DIR=$(shell dirname $(shell dirname $(prefix)))/etc/postinstall
+# avoid collapsed directory constructs '//'
+etc=$(dir $(patsubst %/, %, $(dir $(prefix))))etc
+INSTALLATION_DIR=$(etc)/postinstall
 INSTALLATION_FILES=$(OUT_POST_INSTALLS)
 
-INSTALLATION_OUT_DIR1=$(shell dirname $(shell dirname $(prefix)))/etc/profile.d
+INSTALLATION_OUT_DIR1=$(etc)/profile.d
 INSTALLATION_OUT_FILES1=$(OUT_PROFILES)
 
 INSTALLATION_OUT_DIR2=$(datadir)/tex

diff --git a/config.make.in b/config.make.in
index 298371f9fbfce276bc106030f338b98afe7a3e2d..4ae9b932851cddd9ad4b74557dedc14ddefdc67c 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -56,7 +56,6 @@ FIND = @FIND@
 FLEX = @FLEX@
 GUILE = @GUILE@
 GUILE_CONFIG = @GUILE_CONFIG@
-GUILE_CONFIG = @GUILE_CONFIG@
 GUILE_CFLAGS = @GUILE_CFLAGS@
 GUILE_LDFLAGS = @GUILE_LDFLAGS@
 INIMETAFONT = @INIMETAFONT@