From e854d17ce38d9bf2ab3ea58b91810d9d91258a70 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20Ribes?= Date: Wed, 25 May 2011 15:41:04 +0200 Subject: [PATCH] make distcheck work --- bin/Makefile.am | 4 ++-- doc/Makefile.am | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/Makefile.am b/bin/Makefile.am index c895b41..ae1d742 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -5,7 +5,7 @@ bin_SCRIPTS = AdaoYacsSchemaCreator.py qtEficas_adao_study.py AdaoCatalogGenerat EXTRA_DIST = AdaoYacsSchemaCreator.py qtEficas_adao_study.py.in AdaoCatalogGenerator.py install-data-hook: - @export PYTHONPATH=${salomepythondir}:${PYTHONPATH} && python $(top_srcdir)/bin/AdaoCatalogGenerator.py ${salomepythondir}/daEficas ADAO_Cata_V0.py + @export PYTHONPATH=$(DESTDIR)${salomepythondir}:${PYTHONPATH} && python $(top_srcdir)/bin/AdaoCatalogGenerator.py $(DESTDIR)${salomepythondir}/daEficas ADAO_Cata_V0.py uninstall-hook: - @rm ${salomepythondir}/daEficas/ADAO_Cata_V0.py + @rm $(DESTDIR)${salomepythondir}/daEficas/ADAO_Cata_V0.py diff --git a/doc/Makefile.am b/doc/Makefile.am index f268c71..e10d3c7 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -31,15 +31,15 @@ EXTRA_DIST = conf.py advanced.rst examples.rst index.rst intro.rst theory.rs install-data-local: make html ${mkinstalldirs} $(DESTDIR)$(docdir) - ${mkinstalldirs} $(salomeresdir) + ${mkinstalldirs} $(DESTDIR)$(salomeresdir) cp -R $(BUILDDIR)/html/* $(DESTDIR)$(docdir) - cp $(SRCDIR)/resources/*.png $(salomeresdir) - cp $(SRCDIR)/images/eficas_*.png $(salomeresdir) + cp $(SRCDIR)/resources/*.png $(DESTDIR)$(salomeresdir) + cp $(SRCDIR)/images/eficas_*.png $(DESTDIR)$(salomeresdir) uninstall-local: chmod -R +w $(DESTDIR)$(docdir) rm -rf $(DESTDIR)$(docdir) - rm -f $(salomeresdir)/*.png + rm -f $(DESTDIR)$(salomeresdir)/*.png clean-local: -rm -rf $(top_builddir)/doc/build -- 2.39.2