* cygwin/GNUmakefile (INSTALLATION_OUT_SUFFIXES): Remove profile

stuff.

* Documentation/user/GNUmakefile: Only build music-glossary with
rendered lilypond snippets during web.

diff --git a/ChangeLog b/ChangeLog
index a587b30b798e8837dcb51a23f1082386c4cb4983..186b532abec5b6180ff45e293d31988fb67a5fbb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-04-25  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * cygwin/GNUmakefile (INSTALLATION_OUT_SUFFIXES): Remove profile
+       stuff.
+
        * scm/output-ps.scm (grob-cause): Bugfix.
 
        * scm/lily.scm (ly:load): Remove x11-color.

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index 8f7c0c345e4b09d8333ee8f7110a4a7080e63c78..0ba8a4dbab6e9f3c4a682b3f980e818fd2754112 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -3,15 +3,16 @@ depth=../..
 LATEX_FILES =$(wildcard *.latex)
 
 # todo: add latex.
-DVI_FILES = $(addprefix $(outdir)/, $(TELY_FILES:.tely=.dvi))
+DVI_FILES = $(TELY_FILES:%.tely=$(outdir)/%.dvi)
 
 EXTRA_DIST_FILES= $(LATEX_FILES) $(IMAGES)
 IMAGES=$(wildcard *.png)
 
-OUT_EPS_IMAGES=$(addprefix $(outdir)/,$(IMAGES:.png=.eps))
-OUT_PNG_IMAGES=$(addprefix $(outdir)/,$(IMAGES))
-OUT_ITEXI_FILES=$(addprefix $(outdir)/,$(ITELY_FILES:.itely=.itexi) 
-HTML_FILES = $(addprefix $(outdir)/, $(TELY_FILES:.tely=.html))\
+OUT_EPS_IMAGES=$(IMAGES:%.png=$(outdir)/%.eps)
+OUT_PNG_IMAGES=$(IMAGES:%=$(outdir)/%)
+OUT_TEXI_FILES=$(ITEXI_FILES:%.itexi=$(outdir)/%.texi)\
+ $(ITELY_FILES:%.itely=$(outdir)/%.texi)
+HTML_FILES = $(TELY_FILES:%.tely=$(outdir)/%.html)\
  $(outdir)/lilypond-internals.html
 
 PS_FILES = $(DVI_FILES:.dvi=.ps)
@@ -241,7 +242,7 @@ $(builddir)/mf/$(outconfbase)/feta16list.ly:
 $(outdir)/lilypond.texi: $(ITELY_FILES) $(ITEXI_FILES) 
 $(outdir)/lilypond.nexi: $(ITELY_FILES) $(ITEXI_FILES)
 
-# Prevent music-glossary.texi from default
+# Prevent building music-glossary.texi from default target
 $(outdir)/music-glossary.nexi:
 
 # Rules for the automatically generated documentation
@@ -269,11 +270,10 @@ $(outdir)/lilypond-internals.nexi $(outdir)/lilypond-internals.texi:
        touch $@
        touch $(outdir)/$(*F).nexi
 
-$(outdir)/interfaces.itexi:
+$(outdir)/programming-interface.texi:
        cp dummy-interfaces.itexi $@
 endif
 
-
 local-clean: local-delete
 
 local-delete:

diff --git a/cygwin/GNUmakefile b/cygwin/GNUmakefile
index eaef83507837bf31b66004e22e01038071dbbf7b..ecfe3b5171b45c3c200508d3c80f15aba7e463b2 100644 (file)
--- a/cygwin/GNUmakefile
+++ b/cygwin/GNUmakefile
@@ -21,36 +21,17 @@ OUT_POSTINSTALLS=$(POSTINSTALLS:%=$(outdir)/%)
 POSTREMOVES=$(wildcard postremove*.sh)
 OUT_POSTREMOVES=$(POSTREMOVES:%=$(outdir)/%)
 
-PROFILES=$(wildcard *-profile.sh) lilypond-profile.sh
-OUT_PROFILES=$(PROFILES:%=$(outdir)/%)
+default: $(OUT_POSTINSTALLS) $(OUT_POSTREMOVES) $(OUTIN_FILES) 
 
-# profiles
-$(outdir)/%.sh: %.sh $(config_make)
-       cat $< | sed $(sed-atvariables) > $@
-       chmod 755 $@
-
-# Get profile from buildscripts
-$(outdir)/lilypond-profile.sh: $(outdir)/../$(depth)/buildscripts/$(outconfbase)/lilypond-profile
-       cp $< $@
-       chmod 755 $@
-
-default: $(OUT_POSTINSTALLS) $(OUT_POSTREMOVES) $(OUT_PROFILES) $(OUTIN_FILES) 
-
-INSTALLATION_OUT_SUFFIXES=1 2 # 3
+INSTALLATION_OUT_SUFFIXES=1
 
 # Avoid collapsed directory constructs '//'
 etc=$(patsubst %/, %, $(dir $(prefix)))/etc
 INSTALLATION_DIR=$(etc)/postinstall
 INSTALLATION_FILES=$(OUT_POSTINSTALLS)
 
-INSTALLATION_OUT_DIR1=$(etc)/profile.d
-INSTALLATION_OUT_FILES1=$(OUT_PROFILES)
-
-INSTALLATION_OUT_DIR2=$(etc)/postremove
-INSTALLATION_OUT_FILES2=$(OUT_POSTREMOVES)
-
-# INSTALLATION_OUT_DIR3=$(local_lilypond_datadir)/tex
-# INSTALLATION_OUT_FILES3=$(shell kpsewhich geometry.sty)
+INSTALLATION_OUT_DIR1=$(etc)/postremove
+INSTALLATION_OUT_FILES1=$(OUT_POSTREMOVES)
 
 endif
 

diff --git a/make/stepmake.make b/make/stepmake.make
index 3c3f64a3f5361403ced550a524c4f778f3b3a791..71dde6f7f8940545c24dae69154970129f927c47 100644 (file)
--- a/make/stepmake.make
+++ b/make/stepmake.make
@@ -72,7 +72,7 @@ endif
 ifeq ($(builddir),)
   outroot=.
 else
-  outroot=$(builddir)/$(patsubst $(shell cd $(depth); pwd)%,%,$(pwd))
+  outroot=$(builddir)$(patsubst $(shell cd $(depth); pwd)%,%,$(pwd))
 endif
 
 include $(config_make)