Download as
Browse Code »

Commit 0a468c868910a2308612b6f6b86f6c29ff61ba95

Authored by Alexandre Barbosa
1 parent 0b05835b
Exists in master and in 79 other branches add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev_env_minimal, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, prezento, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

Fixing Makefile 

- Handling tarball remove command
- Installing only colab_spb_theme directory

Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
Signed-off-by: Paulo Tada <paulohtfs@gmail.com>
Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
Makefile
  Diff comments   View file @0a468c8
... ... @@ -12,11 +12,11 @@ dist: clean
12 12 mkdir $(DISTDIR)
13 13 tar --exclude=.git --exclude=$(DISTDIR) -cf - * | (cd $(DISTDIR) && tar xaf -)
14 14 tar --exclude=.git -caf $(TARBALL) $(DISTDIR)
15   - rm ~/rpmbuild/SOURCES/$(TARBALL) && cp $(TARBALL) ~/rpmbuild/SOURCES/
  15 + rm -f ~/rpmbuild/SOURCES/$(TARBALL) && cp $(TARBALL) ~/rpmbuild/SOURCES/
16 16 clean:
17 17 $(RM) $(TARBALL)
18 18 $(RM) -r $(DISTDIR)
19 19  
20 20 install:
21 21 install -d -m 0755 $(DESTDIR)/$(colab_dir)/colab-spb-theme
22   - cp -vr . $(DESTDIR)/$(colab_dir)/colab-spb-theme
  22 + cp -vr colab_spb_theme $(DESTDIR)/$(colab_dir)/colab-spb-theme
... ...