Commit 821b4f5ad60dec593cc2b76c1802b6596f9f282b
Merge branch 'release' into integration
# Conflicts: # Makefile.am # README.md
Showing
3 changed files
with
17 additions
and
4 deletions
Makefile.am
| 1 | 1 | ############################################################################# |
| 2 | 2 | # Makefile.am for GammaLib package # |
| 3 | 3 | # ------------------------------------------------------------------------- # |
| 4 | -# Copyright (C) 2016 Juergen Knoedlseder # | |
| 4 | +# Copyright (C) 2016-2017 Juergen Knoedlseder # | |
| 5 | 5 | # ------------------------------------------------------------------------- # |
| 6 | 6 | # # |
| 7 | 7 | # This program is free software: you can redistribute it and/or modify # |
| ... | ... | @@ -38,9 +38,9 @@ pkgconfig_DATA = gammalib.pc |
| 38 | 38 | |
| 39 | 39 | # Conda activate directory |
| 40 | 40 | condaactivatedir = $(sysconfdir)/conda/activate.d |
| 41 | -condaactivate_DATA = dev/gammalib-activate.sh | |
| 41 | +condaactivate_DATA = dev/00-gammalib-activate.sh | |
| 42 | 42 | condadeactivatedir = $(sysconfdir)/conda/deactivate.d |
| 43 | -condadeactivate_DATA = dev/gammalib-deactivate.sh | |
| 43 | +condadeactivate_DATA = dev/01-gammalib-deactivate.sh | |
| 44 | 44 | |
| 45 | 45 | # Manual pages to install |
| 46 | 46 | man_MANS = |
| ... | ... | @@ -57,7 +57,12 @@ docdir = ${datadir}/doc/${PACKAGE} |
| 57 | 57 | |
| 58 | 58 | # Extra files to be distributed in the tar file |
| 59 | 59 | EXTRA_DIST = README.md \ |
| 60 | - doc/Doxyfile doc/source | |
| 60 | + doc/Doxyfile doc/source \ | |
| 61 | + dev/testreport.py \ | |
| 62 | + dev/00-gammalib-activate.sh dev/01-gammalib-deactivate.sh \ | |
| 63 | + dev/conda.recipe/build.sh \ | |
| 64 | + dev/conda.recipe/conda_build_config.yaml \ | |
| 65 | + dev/conda.recipe/meta.yaml.in | |
| 61 | 66 | |
| 62 | 67 | #install-data-local: $(HTML_INSTALL_DATA_TARGETS) |
| 63 | 68 | #uninstall-local: $(HTML_UNINSTALL_DATA_TARGETS) | ... | ... |
dev/00-gammalib-activate.sh
0 → 100644
dev/01-gammalib-deactivate.sh
0 → 100644