From 63e962d6b6283abc1fdad7a0f3502f3e551a1b92 Mon Sep 17 00:00:00 2001 From: Graham Percival Date: Sun, 27 Dec 2009 23:36:34 +0000 Subject: [PATCH] Build: add WEBSITE_ONLY_BUILD to ease maintenance. --- GNUmakefile.in | 6 ++++-- website.make | 35 +++++++++++++++++++---------------- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/GNUmakefile.in b/GNUmakefile.in index 6574e6540e..569548a3e7 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -291,6 +291,8 @@ test-snippets-clean: # we want this separate for security; see CG 4.2. -gp website: - $(MAKE) -f $(top-src-dir)/website.make \ - top-src-dir=$(top-src-dir) website + $(MAKE) config_make=$(config_make) \ + top-src-dir=$(top-src-dir) \ + -f $(top-src-dir)/website.make \ + website diff --git a/website.make b/website.make index c10f9e6f2c..42d240d1bd 100644 --- a/website.make +++ b/website.make @@ -2,27 +2,31 @@ # website (without the rest of the docs) ################################################################ -##### SECURITY -- change these values for lilypond.org ######## +##### SECURITY -- check these values for lilypond.org ######### ################################################################ -### for lilypond.org (comment out in git) -#top-src-dir=$(HOME)/src/lilypond/ -#trusted-dir=$(HOME)/lilypond/trusted-scripts/ - -### for normal git (comment out on lilypond.org) -script-dir=$(top-src-dir)/scripts/build/ -texi2html-init-file=$(top-src-dir)/Documentation/lilypond-texi2html.init -TEXI2HTML=texi2html -### for lilypond.org (comment out in git) -#script-dir=$(trusted-dir) -#texi2html-init-file=$(top-src-dir)/Documentation/lilypond-texi2html.init -#TEXI2HTML=$(HOME)/usr/bin/texi2html +ifeq ($(WEBSITE_ONLY_BUILD),1) + ### for lilypond.org + top-src-dir=$(HOME)/src/lilypond + trusted-dir=$(HOME)/lilypond/trusted-scripts + script-dir=$(trusted-dir) + texi2html-init-file=$(trusted-dir)/lilypond-texi2html.init + TEXI2HTML_PROGRAM=$(HOME)/usr/bin/texi2html +else + ### for normal git + script-dir=$(top-src-dir)/scripts/build/ + texi2html-init-file=$(top-src-dir)/Documentation/lilypond-texi2html.init + include $(config_make) +endif ################################################################ +OUT=out-website + +TEXI2HTML = SRC_DIR=$(top-src-dir)/Documentation/ PERL_UNICODE=SD $(TEXI2HTML_PROGRAM) EXTRACT_TEXI_FILENAMES=python $(script-dir)/extract_texi_filenames.py CREATE_VERSION=python $(script-dir)/create-version-itexi.py -OUT=out-website + EXAMPLES=$(HOME)/media/examples/ PICTURES=$(HOME)/media/pictures @@ -47,8 +51,7 @@ website-xrefs: website-version -I $(OUT) -o $(OUT) $(manual) && ) : website-texinfo: website-version website-xrefs - SRC_DIR=$(top-src-dir)/Documentation/ \ - PERL_UNICODE=SD $(TEXI2HTML) --prefix=index \ + $(TEXI2HTML) --prefix=index \ --split=section \ --I=$(top-src-dir)/Documentation/ \ --I=$(OUT) \ -- 2.39.5