X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Fstepmake%2Fgeneric-vars.make;h=b0fc521e931334a8f4c25867658fe183df7c4b7c;hb=6c323bc1bb27a79f687f5f3f3ed6b105aad24caa;hp=6a8729df5f670e847b0307cf3b1fc7b65bc80d49;hpb=fd7b0ae3e3cce6e083b344da6554f144d3130a6b;p=lilypond.git diff --git a/stepmake/stepmake/generic-vars.make b/stepmake/stepmake/generic-vars.make index 6a8729df5f..b0fc521e93 100644 --- a/stepmake/stepmake/generic-vars.make +++ b/stepmake/stepmake/generic-vars.make @@ -37,13 +37,13 @@ endif distname = $(package)-$(TOPLEVEL_VERSION) doc-dir = $(src-depth)/Documentation -po-dir = $(src-depth)/po -step-bindir = $(stepmake)/bin +po-srcdir = $(src-depth)/po +po-outdir = $(depth)/po/$(outdir) # stepmake package support. DEPTH = $(depth)/$(package-depth) -INSTALLPY=$(PYTHON) $(step-bindir)/install.py -c +INSTALLPY=$(buildscript-dir)/install -c INSTALL=$(INSTALLPY) group-dir = $(shell cd $(DEPTH);pwd)/.. @@ -82,7 +82,6 @@ INCLUDES = $(src-dir)/include $(outdir) $($(PACKAGE)_INCLUDES) $(MODULE_INCLUDES M4 = m4 -DIST_FILES=$(EXTRA_DIST_FILES) GNUmakefile $(ALL_SOURCES) $(call src-wildcard,SConscript) DOCDIR=$(depth)/$(outdir) #? @@ -103,11 +102,6 @@ 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)))