X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=website.make;h=b03012d15113382050afb9f5fa76f22c3e3b6e4d;hb=40652d626dc52d09f28ec25e1a986c036ac171ae;hp=f6da80dea453da8fbfe6e51502282b33f5635c75;hpb=fc5ab26e3d13884e92981243219bd04d3fb921fa;p=lilypond.git

diff --git a/website.make b/website.make
index f6da80dea4..b03012d151 100644
--- a/website.make
+++ b/website.make
@@ -11,6 +11,8 @@ ifeq ($(WEBSITE_ONLY_BUILD),1)
   trusted-dir=$(HOME)/lilypond/trusted-scripts
   script-dir=$(trusted-dir)
   texi2html-init-file=$(trusted-dir)/lilypond-texi2html.init
+  top-htaccess=$(trusted-dir)/lilypond.org.htaccess
+  dir-htaccess=$(trusted-dir)/website-dir.htaccess
   TEXI2HTML_PROGRAM=$(HOME)/usr/bin/texi2html
   EXAMPLES=$(HOME)/media/ly-examples/
   PICTURES=$(HOME)/media/pictures
@@ -18,6 +20,8 @@ else
   ### for normal git
   script-dir=$(top-src-dir)/scripts/build/
   texi2html-init-file=$(top-src-dir)/Documentation/lilypond-texi2html.init
+  top-htaccess=$(top-src-dir)/Documentation/web/server/lilypond.org.htaccess
+  dir-htaccess=$(top-src-dir)/Documentation/web/server/website-dir.htaccess
   include $(config_make)
   # I assume this is run from top-build-dir
   EXAMPLES=Documentation/web/ly-examples/out-www/
@@ -130,7 +134,8 @@ web-post:
 
 website: website-texinfo website-css website-pictures website-examples web-post
 	cp $(SERVER_FILES)/favicon.ico $(OUT)/website/
-	cp $(SERVER_FILES)/lilypond.org.htaccess $(OUT)/website/.htaccess
 	cp $(SERVER_FILES)/robots.txt $(OUT)/website/
+	cp $(top-htaccess) $(OUT)/.htaccess
+	cp $(dir-htaccess) $(OUT)/website/.htaccess