resolve merge

[lilypond.git] / stepmake / stepmake / generic-vars.make

diff --git a/stepmake/stepmake/generic-vars.make b/stepmake/stepmake/generic-vars.make
index f4c843649447decd4e82c8a5d1ca19550cf40f46..6a8729df5f670e847b0307cf3b1fc7b65bc80d49 100644 (file)
--- a/stepmake/stepmake/generic-vars.make
+++ b/stepmake/stepmake/generic-vars.make
@@ -65,12 +65,12 @@ TOPLEVEL_VERSION=$(TOPLEVEL_MAJOR_VERSION).$(TOPLEVEL_MINOR_VERSION).$(TOPLEVEL_
 endif
 
 
-# no local settings in the build process.
+# no locale settings in the build process.
 LANG=
 export LANG
 
 
-INFO_DIRECTORIES = Documentation/user input/lsr
+INFO_DIRECTORIES = Documentation
 
 # clean file lists:
 #
@@ -103,6 +103,11 @@ SOURCE_FILES += $(IN_FILES)
 # Preprocessed .in documentation _FILES:
 OUTIN_FILES = $(addprefix $(outdir)/, $(IN_FILES:%.in=%))
 
+# CSS source files are in a unique directory
+CSS_DIRECTORY = $(top-src-dir)/Documentation/css
+CSS_FILES := $(shell ls $(CSS_DIRECTORY)/*.css)
+OUT_CSS_FILES = $(CSS_FILES:$(CSS_DIRECTORY)/%.css=$(outdir)/%.css)
+
 ALL_SOURCES = $(SOURCE_FILES)
 
 ifeq (cygwin,$(findstring cygwin,$(HOST_ARCH)))