From 649ad899d7e5e2c9883ec6c11437558e0a6f2bf4 Mon Sep 17 00:00:00 2001 From: jan Date: Fri, 17 May 2002 10:06:27 +0000 Subject: [PATCH] Avoid collapsed directory constructs '//'. --- ChangeLog | 3 +++ Documentation/windows/GNUmakefile | 6 ++++-- config.make.in | 1 - 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 491af502b4..fe163020aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2002-05-17 Jan Nieuwenhuizen + * 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 965599a12c..0416dff9a9 100644 --- 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 298371f9fb..4ae9b93285 100644 --- 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@ -- 2.39.5