From 5c99e37b5f255ef5613d5d9778281b583b77d439 Mon Sep 17 00:00:00 2001 From: Jürgen Knödlseder Date: Mon, 26 Oct 2015 13:58:59 +0100 Subject: [PATCH] Install cscripts and tests folder in pyexecdir (instead of pythondir). --- cscripts/Makefile.am | 12 ++---------- pyext/Makefile.am | 6 +++--- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/cscripts/Makefile.am b/cscripts/Makefile.am index 48962f7..7de7075 100644 --- a/cscripts/Makefile.am +++ b/cscripts/Makefile.am @@ -1,8 +1,6 @@ ## Process this file with automake to produce Makefile.in # Scripts to be distributed in bindir -#binscripts = cta_kb_bkgrates.py cta_root2irf.py cta_make_nodes.py \ -# tsmerge.py binscripts = tsmerge.py # Scripts to be distributed in $(pythondir)/cscripts @@ -12,23 +10,17 @@ pythonscripts = __init__.py \ csinfo.py \ obsutils.py -# Test scripts to be distributed in $(pythondir)/cscripts/tests -#testscripts = tests/__init__.py \ -# tests/scripts.py - # Scripts for which symbolic links will be created in bindir linkscripts = cspull cssens cstsdist cscaldb csresmap \ cshessobs csobsdef csspec cslightcrv \ csinfo # Distribute scripts -EXTRA_DIST = $(binscripts) $(pythonscripts) $(testscripts) +EXTRA_DIST = $(binscripts) $(pythonscripts) binscriptsdir = $(bindir) binscripts_DATA = $(binscripts) -pythonscriptsdir = $(pythondir)/cscripts +pythonscriptsdir = $(pyexecdir)/cscripts pythonscripts_DATA = $(pythonscripts) -#testscriptsdir = $(pythondir)/cscripts/tests -#testscripts_DATA = $(testscripts) # Add hook rule to create symbolic links for cscripts install-data-hook: diff --git a/pyext/Makefile.am b/pyext/Makefile.am index 6553a14..f378668 100755 --- a/pyext/Makefile.am +++ b/pyext/Makefile.am @@ -54,11 +54,11 @@ testirf = $(abs_top_srcdir)/test/irf/cta_dummy_irf.dat # Distribute scripts EXTRA_DIST = $(testscripts) $(testdata) $(testirf) -testscriptsdir = $(pythondir)/ctools/tests +testscriptsdir = $(pyexecdir)/ctools/tests testscripts_DATA = $(testscripts) -testdatadir = $(pythondir)/ctools/tests/data +testdatadir = $(pyexecdir)/ctools/tests/data testdata_DATA = $(testdata) -testirfdir = $(pythondir)/ctools/tests/irf +testirfdir = $(pyexecdir)/ctools/tests/irf testirf_DATA = $(testirf) # Set SWIG interface filename -- libgit2 0.21.4