diff -p -up elmer-5.4.1.4579/elmerparam/src/Makefile.in.orig elmer-5.4.1.4579/elmerparam/src/Makefile.in --- elmer-5.4.1.4579/elmerparam/src/Makefile.in.orig 2010-08-22 15:01:56.000000000 -0300 +++ elmer-5.4.1.4579/elmerparam/src/Makefile.in 2010-08-22 15:02:24.000000000 -0300 @@ -660,9 +660,9 @@ uninstall-am: uninstall-binPROGRAMS unin @UPPERCASEMODS_TRUE@install-exec-local: -@UPPERCASEMODS_TRUE@ $(INSTALL) ELMERPARAM.mod $(includedir) +@UPPERCASEMODS_TRUE@ $(INSTALL) ELMERPARAM.mod $(DESTDIR)$(includedir) @UPPERCASEMODS_FALSE@install-exec-local: -@UPPERCASEMODS_FALSE@ $(INSTALL) elmerparam.mod $(includedir) +@UPPERCASEMODS_FALSE@ $(INSTALL) elmerparam.mod $(DESTDIR)$(includedir) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -p -up elmer-5.4.1.4579/fem/src/binio/Makefile.in.orig elmer-5.4.1.4579/fem/src/binio/Makefile.in --- elmer-5.4.1.4579/fem/src/binio/Makefile.in.orig 2010-08-22 15:04:28.000000000 -0300 +++ elmer-5.4.1.4579/fem/src/binio/Makefile.in 2010-08-22 15:04:43.000000000 -0300 @@ -264,7 +264,7 @@ SUBDIRS = test AM_FCFLAGS = @INCLUDE_MODULE_FLAG@. @INCLUDE_MODULE_FLAG@.. noinst_LIBRARIES = libbinio.a libbinio_a_SOURCES = binio.c kinds.f90 biniomod.f90 -ELMER_SOLVER_DATADIR = $(prefix)/share/elmersolver +ELMER_SOLVER_DATADIR = $(prefix) all: all-recursive .SUFFIXES: diff -p -up elmer-5.4.1.4579/fem/src/Makefile.am.orig elmer-5.4.1.4579/fem/src/Makefile.am --- elmer-5.4.1.4579/fem/src/Makefile.am.orig 2010-08-22 15:04:55.000000000 -0300 +++ elmer-5.4.1.4579/fem/src/Makefile.am 2010-08-22 15:05:17.000000000 -0300 @@ -180,7 +180,7 @@ ResultToResult$(EXE_EXT): libelmersolver -L. -lelmersolver mpi_stubs$(OBJ_EXT) $(EXTRA_LIBS) endif -ELMER_SOLVER_DATADIR=$(prefix)/share/elmersolver +ELMER_SOLVER_DATADIR=$(prefix) install-data-local: @echo "Installing solvers to ${ELMER_SOLVER_DATADIR}/lib" diff -p -up elmer-5.4.1.4579/fem/src/Makefile.in.orig elmer-5.4.1.4579/fem/src/Makefile.in --- elmer-5.4.1.4579/fem/src/Makefile.in.orig 2010-08-22 15:01:07.000000000 -0300 +++ elmer-5.4.1.4579/fem/src/Makefile.in 2010-08-22 15:01:42.000000000 -0300 @@ -415,7 +415,7 @@ NORMAL_TARGETS = mpif libelmersolver$(SH MPI_TARGETS = ElmerSolver_mpi$(EXE_EXT) @USE_MPI_FALSE@ELMER_TARGETS = $(NORMAL_TARGETS) @USE_MPI_TRUE@ELMER_TARGETS = $(NORMAL_TARGETS) $(MPI_TARGETS) -ELMER_SOLVER_DATADIR = $(prefix)/share/elmersolver +ELMER_SOLVER_DATADIR = $(prefix) @HAVE_WINDRES_FALSE@SC2Elmer_SOURCES = SC2Elmer.c @HAVE_WINDRES_TRUE@SC2Elmer_SOURCES = SC2Elmer.c Sico2Elmer-res.rc EXTRA_DIST = \ diff -p -up elmer-5.4.1.4579/front/src/Makefile.am.orig elmer-5.4.1.4579/front/src/Makefile.am --- elmer-5.4.1.4579/front/src/Makefile.am.orig 2010-08-22 15:05:32.000000000 -0300 +++ elmer-5.4.1.4579/front/src/Makefile.am 2010-08-22 15:06:25.000000000 -0300 @@ -85,16 +85,16 @@ ElmerFront_SOURCES = $(COMMON_SRCS) endif install-data-local: - @echo "Installing tcl scripts to ${prefix}/share/elmerfront/tcl" + @echo "Installing tcl scripts to ${prefix}/tcl" - mkdir -p "$(DESTDIR)${prefix}/share/elmerfront/tcl" - cp -r ./tcl/* "$(DESTDIR)${prefix}/share/elmerfront/tcl" - rm -rf `find $(DESTDIR)$(prefix)/share/elmerfront/tcl -name .svn` - - @echo "Installing *.edf *.rgb to ${prefix}/share/elmerfront/lib" - mkdir -p "$(DESTDIR)${prefix}/share/elmerfront/lib" - cp -r ./lib/* "$(DESTDIR)${prefix}/share/elmerfront/lib" - rm -rf `find $(DESTDIR)$(prefix)/share/elmerfront/lib -name .svn` + mkdir -p "$(DESTDIR)${prefix}/tcl" + cp -r ./tcl/* "$(DESTDIR)${prefix}/tcl" + rm -rf `find $(DESTDIR)$(prefix)/tcl -name .svn` + + @echo "Installing *.edf *.rgb to ${prefix}/lib" + mkdir -p "$(DESTDIR)${prefix}/lib" + cp -r ./lib/* "$(DESTDIR)${prefix}/lib" + rm -rf `find $(DESTDIR)$(prefix)/lib -name .svn` diff -p -up elmer-5.4.1.4579/front/src/Makefile.in.orig elmer-5.4.1.4579/front/src/Makefile.in --- elmer-5.4.1.4579/front/src/Makefile.in.orig 2010-08-22 15:02:35.000000000 -0300 +++ elmer-5.4.1.4579/front/src/Makefile.in 2010-08-22 15:03:22.000000000 -0300 @@ -636,16 +636,16 @@ uninstall-am: uninstall-binPROGRAMS @HAVE_WINDRES_TRUE@ windres $^ -o $@ install-data-local: - @echo "Installing tcl scripts to ${prefix}/share/elmerfront/tcl" + @echo "Installing tcl scripts to ${prefix}/tcl" - mkdir -p "$(DESTDIR)${prefix}/share/elmerfront/tcl" - cp -r ./tcl/* "$(DESTDIR)${prefix}/share/elmerfront/tcl" - rm -rf `find $(DESTDIR)$(prefix)/share/elmerfront/tcl -name .svn` + mkdir -p "$(DESTDIR)${prefix}/tcl" + cp -r ./tcl/* "$(DESTDIR)${prefix}/tcl" + rm -rf `find $(DESTDIR)$(prefix)/tcl -name .svn` - @echo "Installing *.edf *.rgb to ${prefix}/share/elmerfront/lib" - mkdir -p "$(DESTDIR)${prefix}/share/elmerfront/lib" - cp -r ./lib/* "$(DESTDIR)${prefix}/share/elmerfront/lib" - rm -rf `find $(DESTDIR)$(prefix)/share/elmerfront/lib -name .svn` + @echo "Installing *.edf *.rgb to ${prefix}/lib" + mkdir -p "$(DESTDIR)${prefix}/lib" + cp -r ./lib/* "$(DESTDIR)${prefix}/lib" + rm -rf `find $(DESTDIR)$(prefix)/lib -name .svn` # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -p -up elmer-5.4.1.4579/post/src/Makefile.in.orig elmer-5.4.1.4579/post/src/Makefile.in --- elmer-5.4.1.4579/post/src/Makefile.in.orig 2010-08-22 15:03:41.000000000 -0300 +++ elmer-5.4.1.4579/post/src/Makefile.in 2010-08-22 15:04:15.000000000 -0300 @@ -303,7 +303,7 @@ SUBDIRS = tk glaux camera graphics modul @NOTWINDOWS_TRUE@QueryGLXExt_SOURCES = QueryGLXExt.c @NOTWINDOWS_TRUE@EXTRA_DIST = screensave.c ElmerPost_LDFLAGS = $(SH_EXPALL_FLAG) -ELMER_POST_DATADIR = $(prefix)/share/elmerpost +ELMER_POST_DATADIR = $(prefix) all: all-recursive .SUFFIXES: