--- src5.1.3/HXX2SALOME_SRC_5.1.3/scripts/Makefile.am.orig 2010-02-23 16:34:30.193600117 -0300 +++ src5.1.3/HXX2SALOME_SRC_5.1.3/scripts/Makefile.am 2010-02-23 16:36:43.480596233 -0300 @@ -15,4 +15,4 @@ cpp_compo_template.tgz install-data-hook: - \cp -f ${srcdir}/template_src.tgz ${srcdir}/template_coupling_src.tgz ${exec_prefix}/bin + \cp -f ${srcdir}/template_src.tgz ${srcdir}/template_coupling_src.tgz $(DESTDIR)/${exec_prefix}/bin --- src5.1.3/XDATA_SRC_5.1.3/src/XDATA/Makefile.in.orig 2010-02-25 18:58:05.665231059 -0300 +++ src5.1.3/XDATA_SRC_5.1.3/src/XDATA/Makefile.in 2010-02-25 19:00:25.014233727 -0300 @@ -701,10 +701,10 @@ install-idl: $(prefix)/idl/salome $(IDL_LIST:%=$(prefix)/idl/salome/%); $(prefix)/idl/salome: - $(INSTALL) -d $@ + $(INSTALL) -d $(DESTDIR)$@ $(IDL_LIST:%=$(prefix)/idl/salome/%): $(prefix)/idl/salome/%: % - cp -f $< $@ + cp -f $< $(DESTDIR)$@ install-compiled-idl: @if test -d .idls ; then \ @@ -716,10 +716,10 @@ $(XDATA_RESOURCES_INSTALL_DIRS) $(XDATA_RESOURCES_LISTS) ; $(SALOME_RESOURCES_INSTALL_DIR): - $(INSTALL) -d $@ + $(INSTALL) -d $(DESTDIR)$@ $(SALOME_RESOURCES_LIST:%=$(SALOME_RESOURCES_INSTALL_DIR)/%): $(SALOME_RESOURCES_INSTALL_DIR)/%: % - cp -rf $< $@ + cp -rf $< $(DESTDIR)$@ %.rid: @if test X = X ; then \ @@ -796,10 +796,10 @@ # ------------------------------------------------------------------- $(pkgpythondir)/shared_modules: - $(INSTALL) -d $@ + $(INSTALL) -d $(DESTDIR)$@ $(XDATA_SALOME_SHARED_MODULES_PY_FILES:%=$(pkgpythondir)/shared_modules/%): $(pkgpythondir)/shared_modules/%: % - cp -f $< $@ + cp -f $< $(DESTDIR)$@ install-salome-shared-modules-files: $(pkgpythondir)/shared_modules \ $(XDATA_SALOME_SHARED_MODULES_PY_FILES:%=$(pkgpythondir)/shared_modules/%) --- src5.1.3/XDATA_SRC_5.1.3/src/XDATA/tests/Makefile.in.orig 2010-03-02 20:52:51.099485597 -0300 +++ src5.1.3/XDATA_SRC_5.1.3/src/XDATA/tests/Makefile.in 2010-03-02 20:56:12.330924947 -0300 @@ -498,10 +498,10 @@ export-unittests: $(UNITTESTS_BUILD_SITE) $(UNITTESTS_SITE_LIST); $(UNITTESTS_BUILD_SITE): - $(INSTALL) -d $@ + $(INSTALL) -d $(DESTDIR)$@ $(UNITTESTS_SITE_LIST): $(UNITTESTS_BUILD_SITE)/%: $(srcdir)/% - cp -f $< $@ + cp -f $< $(DESTDIR)$@ # ----------------------------------------------------------------- # Automake "make" targets @@ -532,14 +532,14 @@ install-idl: $(prefix)/idl/salome $(IDL_LIST:%=$(prefix)/idl/salome/%); $(prefix)/idl/salome: - $(INSTALL) -d $@ + $(INSTALL) -d $(DESTDIR)$@ $(IDL_LIST:%=$(prefix)/idl/salome/%): $(prefix)/idl/salome/%: % - cp -f $< $@ + cp -f $< $(DESTDIR)$@ install-compiled-idl: @if test -d .idls ; then \ - cp -rf .idls/* $(pkgpythondir)/. ;\ + cp -rf .idls/* $(DESTDIR)$(pkgpythondir)/. ;\ fi install-salome-resources: $(SALOME_RESOURCES_INSTALL_DIR) \ @@ -547,10 +547,10 @@ $(XDATA_RESOURCES_INSTALL_DIRS) $(XDATA_RESOURCES_LISTS) ; $(SALOME_RESOURCES_INSTALL_DIR): - $(INSTALL) -d $@ + $(INSTALL) -d $(DESTDIR)$@ $(SALOME_RESOURCES_LIST:%=$(SALOME_RESOURCES_INSTALL_DIR)/%): $(SALOME_RESOURCES_INSTALL_DIR)/%: % - cp -rf $< $@ + cp -rf $< $(DESTDIR)$@ %.rid: @if test X = X ; then \ @@ -627,10 +627,10 @@ # ------------------------------------------------------------------- $(pkgpythondir)/shared_modules: - $(INSTALL) -d $@ + $(INSTALL) -d $(DESTDIR)$@ $(XDATA_SALOME_SHARED_MODULES_PY_FILES:%=$(pkgpythondir)/shared_modules/%): $(pkgpythondir)/shared_modules/%: % - cp -f $< $@ + cp -f $< $(DESTDIR)$@ install-salome-shared-modules-files: $(pkgpythondir)/shared_modules \ $(XDATA_SALOME_SHARED_MODULES_PY_FILES:%=$(pkgpythondir)/shared_modules/%) --- src5.1.3/XDATA_SRC_5.1.3/src/XDATAGUI/Makefile.in.orig 2010-03-03 19:38:08.166481535 -0300 +++ src5.1.3/XDATA_SRC_5.1.3/src/XDATAGUI/Makefile.in 2010-03-03 19:42:00.923481371 -0300 @@ -132,7 +132,7 @@ am__leading_dot = @am__leading_dot@ am__tar = @am__tar@ am__untar = @am__untar@ -bindir = @bindir@ +bindir = @bindir@/salome build_alias = @build_alias@ builddir = @builddir@ datadir = @datadir@ @@ -481,10 +481,10 @@ cp -f $(srcdir)/xdatagui $(distdir)/. $(PYTHON_COPY_SITE): - $(INSTALL) -d $@ + $(INSTALL) -d $(DESTDIR)$@ $(PYTHON_COPY_LIST): $(PYTHON_COPY_SITE)/%: % - cp -f $< $@ + cp -f $< $(DESTDIR)$@ python_build_copy: $(PYTHON_COPY_SITE) $(PYTHON_COPY_LIST); @@ -532,10 +532,10 @@ export-unittests: $(UNITTESTS_BUILD_SITE) $(UNITTESTS_SITE_LIST); $(UNITTESTS_BUILD_SITE): - $(INSTALL) -d $@ + $(INSTALL) -d $(DESTDIR)$@ $(UNITTESTS_SITE_LIST): $(UNITTESTS_BUILD_SITE)/%: $(srcdir)/% - cp -f $< $@ + cp -f $< $(DESTDIR)$@ # ----------------------------------------------------------------- # Automake "make" targets @@ -566,14 +566,14 @@ install-idl: $(prefix)/idl/salome $(IDL_LIST:%=$(prefix)/idl/salome/%); $(prefix)/idl/salome: - $(INSTALL) -d $@ + $(INSTALL) -d $(DESTDIR)$@ $(IDL_LIST:%=$(prefix)/idl/salome/%): $(prefix)/idl/salome/%: % - cp -f $< $@ + cp -f $< $(DESTDIR)$@ install-compiled-idl: @if test -d .idls ; then \ - cp -rf .idls/* $(pkgpythondir)/. ;\ + cp -rf .idls/* $(DESTDIR)$(pkgpythondir)/. ;\ fi install-salome-resources: $(SALOME_RESOURCES_INSTALL_DIR) \ @@ -581,10 +581,10 @@ $(XDATA_RESOURCES_INSTALL_DIRS) $(XDATA_RESOURCES_LISTS) ; $(SALOME_RESOURCES_INSTALL_DIR): - $(INSTALL) -d $@ + $(INSTALL) -d $(DESTDIR)$@ $(SALOME_RESOURCES_LIST:%=$(SALOME_RESOURCES_INSTALL_DIR)/%): $(SALOME_RESOURCES_INSTALL_DIR)/%: % - cp -rf $< $@ + cp -rf $< $(DESTDIR)$@ %.rid: @if test X = X ; then \ @@ -661,10 +661,10 @@ # ------------------------------------------------------------------- $(pkgpythondir)/shared_modules: - $(INSTALL) -d $@ + $(INSTALL) -d $(DESTDIR)$@ $(XDATA_SALOME_SHARED_MODULES_PY_FILES:%=$(pkgpythondir)/shared_modules/%): $(pkgpythondir)/shared_modules/%: % - cp -f $< $@ + cp -f $< $(DESTDIR)$@ install-salome-shared-modules-files: $(pkgpythondir)/shared_modules \ $(XDATA_SALOME_SHARED_MODULES_PY_FILES:%=$(pkgpythondir)/shared_modules/%) --- src5.1.3/XDATA_SRC_5.1.3/src/XDATA2SALOME/Makefile.in.orig 2010-03-02 20:41:39.680482039 -0300 +++ src5.1.3/XDATA_SRC_5.1.3/src/XDATA2SALOME/Makefile.in 2010-03-02 20:42:48.154665448 -0300 @@ -618,10 +618,10 @@ $(XDATA2SALOME_DIR): - $(INSTALL) -d $@ + $(INSTALL) -d $(DESTDIR)$@ $(SRCDIR_LIST:%=$(XDATA2SALOME_DIR)/%): $(XDATA2SALOME_DIR)/%: % - cp -f $< $@ + cp -f $< $(DESTDIR)$@ dist-copy: cp -f $(srcdir)/*.idl $(distdir)/. @@ -630,10 +630,10 @@ done $(PYTHON_COPY_SITE): - $(INSTALL) -d $@ + $(INSTALL) -d $(DESTDIR)$@ $(PYTHON_COPY_LIST): $(PYTHON_COPY_SITE)/%: % - cp -f $< $@ + cp -f $< $(DESTDIR)$@ python_build_copy: $(PYTHON_COPY_SITE) $(PYTHON_COPY_LIST); @@ -681,10 +681,10 @@ export-unittests: $(UNITTESTS_BUILD_SITE) $(UNITTESTS_SITE_LIST); $(UNITTESTS_BUILD_SITE): - $(INSTALL) -d $@ + $(INSTALL) -d $(DESTDIR)$@ $(UNITTESTS_SITE_LIST): $(UNITTESTS_BUILD_SITE)/%: $(srcdir)/% - cp -f $< $@ + cp -f $< $(DESTDIR)$@ # ----------------------------------------------------------------- # Automake "make" targets @@ -715,14 +715,14 @@ install-idl: $(prefix)/idl/salome $(IDL_LIST:%=$(prefix)/idl/salome/%); $(prefix)/idl/salome: - $(INSTALL) -d $@ + $(INSTALL) -d $(DESTDIR)$@ $(IDL_LIST:%=$(prefix)/idl/salome/%): $(prefix)/idl/salome/%: % - cp -f $< $@ + cp -f $< $(DESTDIR)$@ install-compiled-idl: @if test -d .idls ; then \ - cp -rf .idls/* $(pkgpythondir)/. ;\ + cp -rf .idls/* $(DESTDIR)$(pkgpythondir)/. ;\ fi install-salome-resources: $(SALOME_RESOURCES_INSTALL_DIR) \ @@ -730,10 +730,10 @@ $(XDATA_RESOURCES_INSTALL_DIRS) $(XDATA_RESOURCES_LISTS) ; $(SALOME_RESOURCES_INSTALL_DIR): - $(INSTALL) -d $@ + $(INSTALL) -d $(DESTDIR)$@ $(SALOME_RESOURCES_LIST:%=$(SALOME_RESOURCES_INSTALL_DIR)/%): $(SALOME_RESOURCES_INSTALL_DIR)/%: % - cp -rf $< $@ + cp -rf $< $(DESTDIR)$@ %.rid: @if test X = X ; then \ @@ -810,10 +810,10 @@ # ------------------------------------------------------------------- $(pkgpythondir)/shared_modules: - $(INSTALL) -d $@ + $(INSTALL) -d $(DESTDIR)$@ $(XDATA_SALOME_SHARED_MODULES_PY_FILES:%=$(pkgpythondir)/shared_modules/%): $(pkgpythondir)/shared_modules/%: % - cp -f $< $@ + cp -f $< $(DESTDIR)$@ install-salome-shared-modules-files: $(pkgpythondir)/shared_modules \ $(XDATA_SALOME_SHARED_MODULES_PY_FILES:%=$(pkgpythondir)/shared_modules/%) --- src5.1.3/XDATA_SRC_5.1.3/src/XDATA2SALOME/tests/Makefile.in.orig 2010-03-04 15:54:58.316483563 -0300 +++ src5.1.3/XDATA_SRC_5.1.3/src/XDATA2SALOME/tests/Makefile.in 2010-03-04 16:16:59.630909591 -0300 @@ -450,10 +450,10 @@ $(PYTHON_COPY_SITE): - $(INSTALL) -d $@ + $(INSTALL) -d $(DESTDIR)$@ $(PYTHON_COPY_LIST): $(PYTHON_COPY_SITE)/%: % - cp -f $< $@ + cp -f $< $(DESTDIR)$@ python_build_copy: $(PYTHON_COPY_SITE) $(PYTHON_COPY_LIST); @@ -501,10 +501,10 @@ export-unittests: $(UNITTESTS_BUILD_SITE) $(UNITTESTS_SITE_LIST); $(UNITTESTS_BUILD_SITE): - $(INSTALL) -d $@ + $(INSTALL) -d $(DESTDIR)$@ $(UNITTESTS_SITE_LIST): $(UNITTESTS_BUILD_SITE)/%: $(srcdir)/% - cp -f $< $@ + cp -f $< $(DESTDIR)$@ # ----------------------------------------------------------------- # Automake "make" targets @@ -535,14 +535,14 @@ install-idl: $(prefix)/idl/salome $(IDL_LIST:%=$(prefix)/idl/salome/%); $(prefix)/idl/salome: - $(INSTALL) -d $@ + $(INSTALL) -d $(DESTDIR)$@ $(IDL_LIST:%=$(prefix)/idl/salome/%): $(prefix)/idl/salome/%: % - cp -f $< $@ + cp -f $< $(DESTDIR)$@ install-compiled-idl: @if test -d .idls ; then \ - cp -rf .idls/* $(pkgpythondir)/. ;\ + cp -rf .idls/* $(DESTDIR)$(pkgpythondir)/. ;\ fi install-salome-resources: $(SALOME_RESOURCES_INSTALL_DIR) \ @@ -550,10 +550,10 @@ $(XDATA_RESOURCES_INSTALL_DIRS) $(XDATA_RESOURCES_LISTS) ; $(SALOME_RESOURCES_INSTALL_DIR): - $(INSTALL) -d $@ + $(INSTALL) -d $(DESTDIR)$@ $(SALOME_RESOURCES_LIST:%=$(SALOME_RESOURCES_INSTALL_DIR)/%): $(SALOME_RESOURCES_INSTALL_DIR)/%: % - cp -rf $< $@ + cp -rf $< $(DESTDIR)$@ %.rid: @if test X = X ; then \ @@ -630,10 +630,10 @@ # ------------------------------------------------------------------- $(pkgpythondir)/shared_modules: - $(INSTALL) -d $@ + $(INSTALL) -d $(DESTDIR)$@ $(XDATA_SALOME_SHARED_MODULES_PY_FILES:%=$(pkgpythondir)/shared_modules/%): $(pkgpythondir)/shared_modules/%: % - cp -f $< $@ + cp -f $< $(DESTDIR)$@ install-salome-shared-modules-files: $(pkgpythondir)/shared_modules \ $(XDATA_SALOME_SHARED_MODULES_PY_FILES:%=$(pkgpythondir)/shared_modules/%) --- src5.1.3/XDATA_SRC_5.1.3/templates/Makefile.in.orig 2010-03-02 20:32:44.430485319 -0300 +++ src5.1.3/XDATA_SRC_5.1.3/templates/Makefile.in 2010-03-02 20:36:27.053481444 -0300 @@ -476,35 +476,35 @@ $(SITE): - $(INSTALL) -d $@ + $(INSTALL) -d $(DESTDIR)$@ $(SITE_LIST): $(SITE)/%:@abs_top_srcdir@/templates/% - ( cd $(SITE) && ln -sf $< ) + ( cd $(DESTDIR)$(SITE) && ln -sf $< ) export-templates: $(SITE) $(SITE_LIST); $(prefix)/share/$(PACKAGE)/templates: - $(INSTALL) -d $@ + $(INSTALL) -d $(DESTDIR)$@ $(XDATA2SALOME_DIR): - $(INSTALL) -d $@ + $(INSTALL) -d $(DESTDIR)$@ $(SRCDIR_FILES:%=$(XDATA2SALOME_DIR)/%): $(XDATA2SALOME_DIR)/%: % - cp -f $< $@ + cp -f $< $(DESTDIR)$@ $(TOP_SRCDIR_LIST:%=$(XDATA2SALOME_DIR)/%): $(XDATA2SALOME_DIR)/%: $(top_srcdir)/% - cp -f $< $@ + cp -f $< $(DESTDIR)$@ $(AM_LIST:%=$(XDATA2SALOME_DIR)/%): $(XDATA2SALOME_DIR)/%: $(top_srcdir)/adm/unix/% - cp -f $< $@ + cp -f $< $(DESTDIR)$@ $(M4_LIST:%=$(XDATA2SALOME_DIR)/%): $(XDATA2SALOME_DIR)/%: $(top_srcdir)/adm/unix/config_files/% - cp -f $< $@ + cp -f $< $(DESTDIR)$@ install-templates: $(prefix)/share/$(PACKAGE)/templates for d in $(SRCDIR_LIST) ; do \ - rm -rf $(prefix)/share/$(PACKAGE)/templates/$$d ; \ - cp -rf $(srcdir)/$$d $(prefix)/share/$(PACKAGE)/templates/. ; \ + rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)/templates/$$d ; \ + cp -rf $(srcdir)/$$d $(DESTDIR)$(prefix)/share/$(PACKAGE)/templates/. ; \ done dist-templates: @@ -513,10 +513,10 @@ done $(PYTHON_COPY_SITE): - $(INSTALL) -d $@ + $(INSTALL) -d $(DESTDIR)$@ $(PYTHON_COPY_LIST): $(PYTHON_COPY_SITE)/%: % - cp -f $< $@ + cp -f $< $(DESTDIR)$@ python_build_copy: $(PYTHON_COPY_SITE) $(PYTHON_COPY_LIST); @@ -564,10 +564,10 @@ export-unittests: $(UNITTESTS_BUILD_SITE) $(UNITTESTS_SITE_LIST); $(UNITTESTS_BUILD_SITE): - $(INSTALL) -d $@ + $(INSTALL) -d $(DESTDIR)$@ $(UNITTESTS_SITE_LIST): $(UNITTESTS_BUILD_SITE)/%: $(srcdir)/% - cp -f $< $@ + cp -f $< $(DESTDIR)$@ # ----------------------------------------------------------------- # Automake "make" targets @@ -598,14 +598,14 @@ install-idl: $(prefix)/idl/salome $(IDL_LIST:%=$(prefix)/idl/salome/%); $(prefix)/idl/salome: - $(INSTALL) -d $@ + $(INSTALL) -d $(DESTDIR)$@ $(IDL_LIST:%=$(prefix)/idl/salome/%): $(prefix)/idl/salome/%: % - cp -f $< $@ + cp -f $< $(DESTDIR)$@ install-compiled-idl: @if test -d .idls ; then \ - cp -rf .idls/* $(pkgpythondir)/. ;\ + cp -rf .idls/* $(DESTDIR)$(pkgpythondir)/. ;\ fi install-salome-resources: $(SALOME_RESOURCES_INSTALL_DIR) \ @@ -613,10 +613,10 @@ $(XDATA_RESOURCES_INSTALL_DIRS) $(XDATA_RESOURCES_LISTS) ; $(SALOME_RESOURCES_INSTALL_DIR): - $(INSTALL) -d $@ + $(INSTALL) -d $(DESTDIR)$@ $(SALOME_RESOURCES_LIST:%=$(SALOME_RESOURCES_INSTALL_DIR)/%): $(SALOME_RESOURCES_INSTALL_DIR)/%: % - cp -rf $< $@ + cp -rf $< $(DESTDIR)$@ %.rid: @if test X = X ; then \ @@ -693,10 +693,10 @@ # ------------------------------------------------------------------- $(pkgpythondir)/shared_modules: - $(INSTALL) -d $@ + $(INSTALL) -d $(DESTDIR)$@ $(XDATA_SALOME_SHARED_MODULES_PY_FILES:%=$(pkgpythondir)/shared_modules/%): $(pkgpythondir)/shared_modules/%: % - cp -f $< $@ + cp -f $< $(DESTDIR)$@ install-salome-shared-modules-files: $(pkgpythondir)/shared_modules \ $(XDATA_SALOME_SHARED_MODULES_PY_FILES:%=$(pkgpythondir)/shared_modules/%) --- src5.1.3/XDATA_SRC_5.1.3/doc/Makefile.in.orig 2010-02-25 20:54:58.742236232 -0300 +++ src5.1.3/XDATA_SRC_5.1.3/doc/Makefile.in 2010-02-25 20:56:12.107599444 -0300 @@ -491,26 +491,26 @@ @touch .depdoc $(DOC_BUILD_SITE): - $(INSTALL) -d $@ + $(INSTALL) -d $(DESTDIR)$@ $(DOC_BUILD_SITE)/xdata.tex: xdata.tex - cp -f $< $@ + cp -f $< $(DESTDIR)$@ install-doc: if test `( cd $(prefix) && pwd )` != `( cd @abs_top_builddir@ && pwd )` ; then \ - rm -rf $(prefix)/share/doc/@PACKAGE@-@RELEASE@ ; \ - mkdir -p $(prefix)/share/doc > /dev/null ; \ - cp -r $(DOC_BUILD_SITE) $(prefix)/share/doc/. ; \ + rm -rf $(DESTDIR)$(prefix)/share/doc/@PACKAGE@-@RELEASE@ ; \ + mkdir -p $(DESTDIR)$(prefix)/share/doc > /dev/null ; \ + cp -r $(DOC_BUILD_SITE) $(DESTDIR)$(prefix)/share/doc/. ; \ fi dist-doc: cp -rf $(DOC_BUILD_SITE)/* $(distdir)/. $(PYTHON_COPY_SITE): - $(INSTALL) -d $@ + $(INSTALL) -d $(DESTDIR)$@ $(PYTHON_COPY_LIST): $(PYTHON_COPY_SITE)/%: % - cp -f $< $@ + cp -f $< $(DESTDIR)$@ python_build_copy: $(PYTHON_COPY_SITE) $(PYTHON_COPY_LIST); @@ -558,10 +558,10 @@ export-unittests: $(UNITTESTS_BUILD_SITE) $(UNITTESTS_SITE_LIST); $(UNITTESTS_BUILD_SITE): - $(INSTALL) -d $@ + $(INSTALL) -d $(DESTDIR)$@ $(UNITTESTS_SITE_LIST): $(UNITTESTS_BUILD_SITE)/%: $(srcdir)/% - cp -f $< $@ + cp -f $< $(DESTDIR)$@ # ----------------------------------------------------------------- # Automake "make" targets @@ -592,14 +592,14 @@ install-idl: $(prefix)/idl/salome $(IDL_LIST:%=$(prefix)/idl/salome/%); $(prefix)/idl/salome: - $(INSTALL) -d $@ + $(INSTALL) -d $(DESTDIR)$@ $(IDL_LIST:%=$(prefix)/idl/salome/%): $(prefix)/idl/salome/%: % - cp -f $< $@ + cp -f $< $(DESTDIR)$@ install-compiled-idl: @if test -d .idls ; then \ - cp -rf .idls/* $(pkgpythondir)/. ;\ + cp -rf .idls/* $(DESTDIR)$(pkgpythondir)/. ;\ fi install-salome-resources: $(SALOME_RESOURCES_INSTALL_DIR) \ @@ -607,10 +607,10 @@ $(XDATA_RESOURCES_INSTALL_DIRS) $(XDATA_RESOURCES_LISTS) ; $(SALOME_RESOURCES_INSTALL_DIR): - $(INSTALL) -d $@ + $(INSTALL) -d $(DESTDIR)$@ $(SALOME_RESOURCES_LIST:%=$(SALOME_RESOURCES_INSTALL_DIR)/%): $(SALOME_RESOURCES_INSTALL_DIR)/%: % - cp -rf $< $@ + cp -rf $< $(DESTDIR)$@ %.rid: @if test X = X ; then \ @@ -687,10 +687,10 @@ # ------------------------------------------------------------------- $(pkgpythondir)/shared_modules: - $(INSTALL) -d $@ + $(INSTALL) -d $(DESTDIR)$@ $(XDATA_SALOME_SHARED_MODULES_PY_FILES:%=$(pkgpythondir)/shared_modules/%): $(pkgpythondir)/shared_modules/%: % - cp -f $< $@ + cp -f $< $(DESTDIR)$@ install-salome-shared-modules-files: $(pkgpythondir)/shared_modules \ $(XDATA_SALOME_SHARED_MODULES_PY_FILES:%=$(pkgpythondir)/shared_modules/%) --- src5.1.3/XDATA_SRC_5.1.3/Makefile.in.orig 2010-03-02 21:05:25.306485728 -0300 +++ src5.1.3/XDATA_SRC_5.1.3/Makefile.in 2010-03-02 21:16:33.177975119 -0300 @@ -751,8 +751,8 @@ install-release-notes: if test `( cd $(prefix) && pwd )` != `( cd @abs_top_builddir@ && pwd )` ; then \ - mkdir -p $(prefix)/share/doc/@PACKAGE@-@RELEASE@ > /dev/null ; \ - cp -f $(srcdir)/ReleaseNotes $(prefix)/share/doc/@PACKAGE@-@RELEASE@/. ; \ + mkdir -p $(DESTDIR)$(prefix)/share/doc/@PACKAGE@-@RELEASE@ > /dev/null ; \ + cp -f $(srcdir)/ReleaseNotes $(DESTDIR)$(prefix)/share/doc/@PACKAGE@-@RELEASE@/. ; \ fi xdata-dist-clean: @@ -772,10 +772,10 @@ rm -rf XDATA_ROOT $(PYTHON_COPY_SITE): - $(INSTALL) -d $@ + $(INSTALL) -d $(DESTDIR)$@ $(PYTHON_COPY_LIST): $(PYTHON_COPY_SITE)/%: % - cp -f $< $@ + cp -f $< $(DESTDIR)$@ python_build_copy: $(PYTHON_COPY_SITE) $(PYTHON_COPY_LIST); @@ -823,10 +823,10 @@ export-unittests: $(UNITTESTS_BUILD_SITE) $(UNITTESTS_SITE_LIST); $(UNITTESTS_BUILD_SITE): - $(INSTALL) -d $@ + $(INSTALL) -d $(DESTDIR)$@ $(UNITTESTS_SITE_LIST): $(UNITTESTS_BUILD_SITE)/%: $(srcdir)/% - cp -f $< $@ + cp -f $< $(DESTDIR)$@ # ----------------------------------------------------------------- # Automake "make" targets @@ -857,10 +857,10 @@ install-idl: $(prefix)/idl/salome $(IDL_LIST:%=$(prefix)/idl/salome/%); $(prefix)/idl/salome: - $(INSTALL) -d $@ + $(INSTALL) -d $(DESTDIR)$@ $(IDL_LIST:%=$(prefix)/idl/salome/%): $(prefix)/idl/salome/%: % - cp -f $< $@ + cp -f $< $(DESTDIR)$@ install-compiled-idl: @if test -d .idls ; then \ @@ -872,10 +872,10 @@ $(XDATA_RESOURCES_INSTALL_DIRS) $(XDATA_RESOURCES_LISTS) ; $(SALOME_RESOURCES_INSTALL_DIR): - $(INSTALL) -d $@ + $(INSTALL) -d $(DESTDIR)$@ $(SALOME_RESOURCES_LIST:%=$(SALOME_RESOURCES_INSTALL_DIR)/%): $(SALOME_RESOURCES_INSTALL_DIR)/%: % - cp -rf $< $@ + cp -rf $< $(DESTDIR)$@ %.rid: @if test X = X ; then \ @@ -952,10 +952,10 @@ # ------------------------------------------------------------------- $(pkgpythondir)/shared_modules: - $(INSTALL) -d $@ + $(INSTALL) -d $(DESTDIR)$@ $(XDATA_SALOME_SHARED_MODULES_PY_FILES:%=$(pkgpythondir)/shared_modules/%): $(pkgpythondir)/shared_modules/%: % - cp -f $< $@ + cp -f $< $(DESTDIR)$@ install-salome-shared-modules-files: $(pkgpythondir)/shared_modules \ $(XDATA_SALOME_SHARED_MODULES_PY_FILES:%=$(pkgpythondir)/shared_modules/%)