diff --git a/make-includes/build_document_rules.make b/make-includes/build_document_rules.make index 4fda82e..567b6d5 100755 --- a/make-includes/build_document_rules.make +++ b/make-includes/build_document_rules.make @@ -155,7 +155,7 @@ # # Directory to install files into on web server. # -INSTALL_DIRECTORY:=$(HANDBOOK_INSTALL_ROOT)/$(SUBJECT_CODE)$(PAPER_NUMBER)/www/$(SECTION)/$(BASE_NAME) +INSTALL_DIRECTORY:=$(HANDBOOK_INSTALL_ROOT)/$(SUBJECT_CODE)$(PAPER_NUMBER)/Blackboard/$(SECTION)/$(BASE_NAME) ################################################################################ @@ -390,10 +390,9 @@ ################################################################################ # -# Install the appropriate files on the web server. This relies on the -# environment variable HANDBOOK_INSTALL_ROOT being defined, and -# (assuming that this variable points to a directory on the network) the -# appropriate share has been mounted. +# Link the appropriate files to the deployment directory. This relies on the +# environment variable HANDBOOK_INSTALL_DIRECTORY being defined, and +# and that it points to a valid directory. # # This checks each file in the build directory against the corresponding # file in the install directory. The local file is only copied to the @@ -410,12 +409,12 @@ install-questions: @$(TEST) -d $(HANDBOOK_INSTALL_ROOT) @$(MKDIR_P) $(INSTALL_DIRECTORY) - @$(foreach f,$(QUESTION_INSTALL_FILES),if $(TEST) ! -f $(INSTALL_DIRECTORY)/$(f) -o $(f) -nt $(INSTALL_DIRECTORY)/$(f); then $(ECHO) "Installing $(f)"; $(CP) $(f) $(INSTALL_DIRECTORY); fi;) + @$(foreach f,$(QUESTION_INSTALL_FILES),if $(TEST) ! -f $(INSTALL_DIRECTORY)/$(f) -o $(CURDIR)/$(f) -nt $(INSTALL_DIRECTORY)/$(f); then $(ECHO) "Linking $(f)"; $(LN_S) $(CURDIR)/$(f) $(INSTALL_DIRECTORY); fi;) install-answers: @$(TEST) -d $(HANDBOOK_INSTALL_ROOT) @$(MKDIR_P) $(INSTALL_DIRECTORY) - @$(foreach f,$(ANSWER_INSTALL_FILES),if $(TEST) ! -f $(INSTALL_DIRECTORY)/$(f) -o $(f) -nt $(INSTALL_DIRECTORY)/$(f); then $(ECHO) "Installing $(f)"; $(CP) $(f) $(INSTALL_DIRECTORY); fi;) + @$(foreach f,$(ANSWER_INSTALL_FILES),if $(TEST) ! -f $(INSTALL_DIRECTORY)/$(f) -o $(CURDIR)/$(f) -nt $(INSTALL_DIRECTORY)/$(f); then $(ECHO) "Linking $(f)"; $(LN_S) $(CURDIR)/$(f) $(INSTALL_DIRECTORY); fi;) ################################################################################