diff --git a/bootstrap/coriolis2.spec.in b/bootstrap/coriolis2.spec.in index aa5c30ba..e541bb8b 100644 --- a/bootstrap/coriolis2.spec.in +++ b/bootstrap/coriolis2.spec.in @@ -119,7 +119,7 @@ Development files for the Coriolis 2 package. %dir %{coriolisTop}/%{_lib} %dir %{coriolisTop}/%{python_sitedir} %dir %{coriolisTop}/%{python_sitedir}/crlcore -%dir %{coriolisTop}/%{python_sitedir}/crlcore/helpers +%dir %{coriolisTop}/%{python_sitedir}/helpers %dir %{coriolisTop}/%{python_sitedir}/cumulus %dir %{coriolisTop}/%{python_sitedir}/stratus %{coriolisTop}/bin/* @@ -130,7 +130,7 @@ Development files for the Coriolis 2 package. %{coriolisTop}/%{python_sitedir}/cumulus/plugins/*/*.py* %{coriolisTop}/%{python_sitedir}/stratus/*.py* %{coriolisTop}/%{python_sitedir}/crlcore/*.py* -%{coriolisTop}/%{python_sitedir}/crlcore/helpers/*.py* +%{coriolisTop}/%{python_sitedir}/helpers/*.py* %{coriolisTop}/%{python_sitedir}/kite/*.py* %{coriolisTop}/%{python_sitedir}/unicorn/*.py* %{_sysconfdir}/coriolis2/*.py diff --git a/crlcore/python/CMakeLists.txt b/crlcore/python/CMakeLists.txt index 5a4697a2..ffedd828 100644 --- a/crlcore/python/CMakeLists.txt +++ b/crlcore/python/CMakeLists.txt @@ -1,7 +1,7 @@ - install( FILES helpers/__init__.py DESTINATION ${Python_CORIOLISLIB}/crlcore/helpers ) - install( FILES helpers/io.py DESTINATION ${Python_CORIOLISLIB}/crlcore/helpers ) - install( FILES helpers/utils.py DESTINATION ${Python_CORIOLISLIB}/crlcore/helpers ) - install( FILES helpers/overlay.py DESTINATION ${Python_CORIOLISLIB}/crlcore/helpers ) - install( FILES helpers/analogtechno.py DESTINATION ${Python_CORIOLISLIB}/crlcore/helpers ) - install( FILES helpers/technology.py DESTINATION ${Python_CORIOLISLIB}/crlcore/helpers ) + install( FILES helpers/__init__.py DESTINATION ${Python_CORIOLISLIB}/helpers ) + install( FILES helpers/io.py DESTINATION ${Python_CORIOLISLIB}/helpers ) + install( FILES helpers/utils.py DESTINATION ${Python_CORIOLISLIB}/helpers ) + install( FILES helpers/overlay.py DESTINATION ${Python_CORIOLISLIB}/helpers ) + install( FILES helpers/analogtechno.py DESTINATION ${Python_CORIOLISLIB}/helpers ) + install( FILES helpers/technology.py DESTINATION ${Python_CORIOLISLIB}/helpers ) diff --git a/nix/crlcore.nix b/nix/crlcore.nix index 433ec9c4..3c1b6901 100644 --- a/nix/crlcore.nix +++ b/nix/crlcore.nix @@ -8,7 +8,6 @@ let pkg = propagatedBuildInputs = [ libxml2 qt4 coriolis-lefdef coriolis-hurricane python3Packages.pyqt4 ]; nativeBuildInputs = [ bison flex doxygen python3Packages.pyqt4 ]; postInstall = '' - ln -s crlcore/helpers $out/${python3Packages.python.sitePackages}/helpers ln -s -t $out/${python3Packages.python.sitePackages} $out/etc/coriolis2/* # for import check