Download as
Browse Code »

Commit 5d3d7567217d3748f9f648ecce42eb5ab5a4ff64

Authored by Antonio Terceiro
1 parent ca899415
Exists in master and in 34 other branches add_super_archives_plugin, automates_core_packing, changes_in_buttons_on_content_panel, colab_fix_automatic_group_creation_bug, gitlab-8.x, gov-user-refactoring, gov-user-refactoring-rails4, gov-user-to-organization, high_contrast, high_contrast_style, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, mezuro_spb, packaging_colab_plugins, refactor_software_communities, refactor_software_communities_rails4, refactor_software_for_sisp, refactor_software_info_to_software, register_page, remove-unused-images, removing_super_archives_email, restore, signals_user_noosfero, software_as_organization, spb_minimal_env, stable-4.1, stable-4.2, stable-4.x, stable-5.0, stable-5.1, temp_soft_comm_refactoring, theme_header, thread_page

doc: always publish docs for the right environment

Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
cookbooks/reverse_proxy/recipes/documentation.rb
  Diff comments   View file @5d3d756
1 -docs = File.expand_path('../../../docs/_build/html', File.dirname(__FILE__)) 1 +docs = File.expand_path("../../../docs/_build/#{node['environment']}/html", File.dirname(__FILE__))
2 2
3 execute 'rsync::docs' do 3 execute 'rsync::docs' do
4 command "rsync -avp --delete #{docs}/ /srv/doc/" 4 command "rsync -avp --delete #{docs}/ /srv/doc/"
@@ -25,7 +25,7 @@ _build/%: %.in build.rb @@ -25,7 +25,7 @@ _build/%: %.in build.rb
25 CLEAN_FILES += $(BUILT) 25 CLEAN_FILES += $(BUILT)
26 26
27 html latexpdf: $(BUILT) 27 html latexpdf: $(BUILT)
28 - $(MAKE) -C _build $@ 28 + $(MAKE) -C _build $@ BUILDDIR=$(SPB_ENV)
29 29
30 clean: 30 clean:
31 $(RM) $(BUILT) 31 $(RM) $(BUILT)