Commit 5c99e37b5f255ef5613d5d9778281b583b77d439
1 parent
ff776480
Install cscripts and tests folder in pyexecdir (instead of pythondir).
Showing
2 changed files
with
5 additions
and
13 deletions
cscripts/Makefile.am
| 1 | 1 | ## Process this file with automake to produce Makefile.in |
| 2 | 2 | |
| 3 | 3 | # Scripts to be distributed in bindir |
| 4 | -#binscripts = cta_kb_bkgrates.py cta_root2irf.py cta_make_nodes.py \ | |
| 5 | -# tsmerge.py | |
| 6 | 4 | binscripts = tsmerge.py |
| 7 | 5 | |
| 8 | 6 | # Scripts to be distributed in $(pythondir)/cscripts |
| ... | ... | @@ -12,23 +10,17 @@ pythonscripts = __init__.py \ |
| 12 | 10 | csinfo.py \ |
| 13 | 11 | obsutils.py |
| 14 | 12 | |
| 15 | -# Test scripts to be distributed in $(pythondir)/cscripts/tests | |
| 16 | -#testscripts = tests/__init__.py \ | |
| 17 | -# tests/scripts.py | |
| 18 | - | |
| 19 | 13 | # Scripts for which symbolic links will be created in bindir |
| 20 | 14 | linkscripts = cspull cssens cstsdist cscaldb csresmap \ |
| 21 | 15 | cshessobs csobsdef csspec cslightcrv \ |
| 22 | 16 | csinfo |
| 23 | 17 | |
| 24 | 18 | # Distribute scripts |
| 25 | -EXTRA_DIST = $(binscripts) $(pythonscripts) $(testscripts) | |
| 19 | +EXTRA_DIST = $(binscripts) $(pythonscripts) | |
| 26 | 20 | binscriptsdir = $(bindir) |
| 27 | 21 | binscripts_DATA = $(binscripts) |
| 28 | -pythonscriptsdir = $(pythondir)/cscripts | |
| 22 | +pythonscriptsdir = $(pyexecdir)/cscripts | |
| 29 | 23 | pythonscripts_DATA = $(pythonscripts) |
| 30 | -#testscriptsdir = $(pythondir)/cscripts/tests | |
| 31 | -#testscripts_DATA = $(testscripts) | |
| 32 | 24 | |
| 33 | 25 | # Add hook rule to create symbolic links for cscripts |
| 34 | 26 | install-data-hook: | ... | ... |
pyext/Makefile.am
| ... | ... | @@ -54,11 +54,11 @@ testirf = $(abs_top_srcdir)/test/irf/cta_dummy_irf.dat |
| 54 | 54 | |
| 55 | 55 | # Distribute scripts |
| 56 | 56 | EXTRA_DIST = $(testscripts) $(testdata) $(testirf) |
| 57 | -testscriptsdir = $(pythondir)/ctools/tests | |
| 57 | +testscriptsdir = $(pyexecdir)/ctools/tests | |
| 58 | 58 | testscripts_DATA = $(testscripts) |
| 59 | -testdatadir = $(pythondir)/ctools/tests/data | |
| 59 | +testdatadir = $(pyexecdir)/ctools/tests/data | |
| 60 | 60 | testdata_DATA = $(testdata) |
| 61 | -testirfdir = $(pythondir)/ctools/tests/irf | |
| 61 | +testirfdir = $(pyexecdir)/ctools/tests/irf | |
| 62 | 62 | testirf_DATA = $(testirf) |
| 63 | 63 | |
| 64 | 64 | # Set SWIG interface filename | ... | ... |