make distcheck work

diff --git a/bin/Makefile.am b/bin/Makefile.am
index c895b4169dfa8c0bbf87bf046c583ea300b037e4..ae1d7429b7e7324c036773f7aa1dda7736e7b4dc 100644 (file)
--- 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 f268c71f1e3a19adf5a1e6a7f6302923e5079502..e10d3c7c87b8abf1ee7150cf672ca8231bf7c4ea 100644 (file)
--- 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