diff --git a/scripts/Makefile.am b/scripts/Makefile.am index e5c3e12..0bbc092 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -7,8 +7,7 @@ binscripts = cta_kb_bkgrates.py cta_root2irf.py cta_make_nodes.py \ # Scripts to be distributed in pythondir pythonscripts = cspull.py cssens.py cstsdist.py cscaldb.py csresmap.py cshessobs.py \ csobsdef.py csspec.py cslightcrv.py \ - lsmodel.py \ - obsutils.py + lsmodel.py # Scripts for which symbolic links will be created in bindir linkscripts = cspull cssens cstsdist cscaldb csresmap \ @@ -19,7 +18,7 @@ linkscripts = cspull cssens cstsdist cscaldb csresmap \ EXTRA_DIST = $(binscripts) $(pythonscripts) binscriptsdir = $(bindir) binscripts_DATA = $(binscripts) -pythonscriptsdir = $(pythondir) +pythonscriptsdir = $(pythondir)/ctools pythonscripts_DATA = $(pythonscripts) # Add hook rule to create symbolic links for cscripts @@ -31,7 +30,7 @@ install-data-hook: @linklist='$(linkscripts)';\ for p in $$linklist; do \ rm -rf "$(DESTDIR)$(bindir)/$$p"; \ - ln -s "$(DESTDIR)$(pythondir)/$$p.py" "$(DESTDIR)$(bindir)/$$p"; \ - chmod +x "$(DESTDIR)$(pythondir)/$$p.py"; \ + ln -s "$(DESTDIR)$(pythondir)/ctools/$$p.py" "$(DESTDIR)$(bindir)/$$p"; \ + chmod +x "$(DESTDIR)$(pythondir)/ctools/$$p.py"; \ done diff --git a/scripts/obsutils.py b/scripts/obsutils.py deleted file mode 100644 index a0df8d0..0000000 --- a/scripts/obsutils.py +++ /dev/null @@ -1,5 +0,0 @@ -print("The obsutils are moved under the ctools module.") -print("Please update your script to import from ctools, i.e:") -print("from ctools import obsutils") - -from ctools.obsutils import *