sdpa/sdpa-dir-fix.patch

   1 --- broken/Makefile.am  2009-07-09 11:18:07.000000000 +0200
   2 +++ fixed/Makefile.am   2010-04-29 17:17:39.574342750 +0200
   3 @@ -1,33 +1,35 @@
   4  SUBDIRS = etc mumps
   5
   6 -exec_prefix    = ${prefix}/@PACKAGE_NAME@.@PACKAGE_VERSION@/
   7 -includedir     = ${prefix}/@PACKAGE_NAME@.@PACKAGE_VERSION@/include
   8 -datadir        = ${prefix}/@PACKAGE_NAME@.@PACKAGE_VERSION@/share
   9 -etcdir         = ${prefix}/@PACKAGE_NAME@.@PACKAGE_VERSION@/etc
  10 -docdir         = ${prefix}/@PACKAGE_NAME@.@PACKAGE_VERSION@/doc
  11 -infodir        = ${prefix}/@PACKAGE_NAME@.@PACKAGE_VERSION@/info
  12 -localstatedir  = ${prefix}/@PACKAGE_NAME@.@PACKAGE_VERSION@/var
  13 -mandir         = ${prefix}/@PACKAGE_NAME@.@PACKAGE_VERSION@/man
  14 -sharedstatedir = ${prefix}/@PACKAGE_NAME@.@PACKAGE_VERSION@/share
  15 -sysconfdir     = ${prefix}/@PACKAGE_NAME@.@PACKAGE_VERSION@/etc
  16 -exampledir     = ${prefix}/@PACKAGE_NAME@.@PACKAGE_VERSION@/example
  17 -libexampledir  = ${prefix}/@PACKAGE_NAME@.@PACKAGE_VERSION@/libexample
  18 -mexdir         = ${prefix}/@PACKAGE_NAME@.@PACKAGE_VERSION@/mex
  19 -
  20 -# each file of mumps is copied by 'nobase' option
  21 -#   due to sub-directory
  22 -mumpsdir     = ${prefix}/@PACKAGE_NAME@.@PACKAGE_VERSION@/
  23 +exec_prefix    = ${prefix}/
  24 +includedir     = ${prefix}/include/@PACKAGE_NAME@
  25 +datadir        = ${prefix}/share/@PACKAGE_NAME@
  26 +etcdir         = ${prefix}/share/@PACKAGE_NAME@
  27 +docdir         = ${prefix}/share/doc/@PACKAGE_NAME@
  28 +infodir        = ${prefix}/info
  29 +localstatedir  = ${prefix}/var
  30 +mandir         = ${prefix}/man
  31 +sharedstatedir = ${prefix}/share/@PACKAGE_NAME@
  32 +exampledir     = ${prefix}/share/@PACKAGE_NAME@/example
  33 +libexampledir  = ${prefix}/share/@PACKAGE_NAME@/libexample
  34 +mexdir         = ${prefix}/share/@PACKAGE_NAME@/mex # not sure on that one
  35 +mumpsdir       = ${prefix}/share/@PACKAGE_NAME@/mumps
  36 +mumps_libdir   = ${libdir}
  37
  38
  39 -etc_DATA = etc/make.inc
  40 +etc_DATA = etc/make.inc bin/param.sdpa
  41  doc_DATA = doc/sdpa7-manual.pdf
  42
  43  include_HEADERS = sdpa_algebra.h sdpa_block.h \
  44  sdpa_call.h sdpa_chordal.h sdpa_dataset.h sdpa_dpotrf.h \
  45  sdpa_include.h sdpa_io.h sdpa_jordan.h sdpa_linear.h sdpa_newton.h \
  46 -sdpa_parts.h sdpa_right.h sdpa_struct.h sdpa_tool.h
  47 +sdpa_parts.h sdpa_right.h sdpa_struct.h sdpa_tool.h \
  48 +mumps/build/include/dmumps_c.h \
  49 +mumps/build/include/dmumps_root.h \
  50 +mumps/build/include/dmumps_struc.h \
  51 +mumps/build/include/mumps_c_types.h \
  52 +mumps/build/include/mumps_compat.h
  53
  54 -lib_LIBRARIES = libsdpa.a
  55 +lib_LIBRARIES = libsdpa.a
  56  libsdpa_a_SOURCES = sdpa_block.cpp sdpa_call.cpp sdpa_chordal.cpp \
  57  sdpa_dataset.cpp sdpa_dpotrf.cpp sdpa_io.cpp sdpa_jordan.cpp \
  58  sdpa_linear.cpp sdpa_newton.cpp sdpa_parts.cpp sdpa_solve.cpp \
  59 @@ -38,24 +40,16 @@
  60  sdpa_parts.h sdpa_right.h sdpa_struct.h sdpa_tool.h
  61  libsdpa_a_CXXFLAGS = $(pthread_cflags) -fPIC -I$(MUMPS_DIR)/include
  62
  63 +mumps_lib_DATA = mumps/build/lib/libdmumps.a \
  64 +mumps/build/lib/libmumps_common.a \
  65 +mumps/build/lib/libpord.a \
  66 +mumps/build/libseq/libmpiseq.a
  67 +
  68  bin_PROGRAMS = sdpa
  69  sdpa_SOURCES = sdpa_exe.cpp
  70  sdpa_LDADD = $(pthread_lib) -L. -lsdpa -L$(MUMPS_DIR)/lib  -ldmumps -lmumps_common -lpord -L$(MUMPS_DIR)/libseq -lmpiseq $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
  71  sdpa_CXXFLAGS = $(pthread_cflags)  -fPIC -I$(MUMPS_DIR)/include
  72
  73 -nobase_mumps_HEADERS = mumps/build/include/dmumps_c.h \
  74 -mumps/build/include/dmumps_root.h \
  75 -mumps/build/include/dmumps_struc.h \
  76 -mumps/build/include/mumps_c_types.h \
  77 -mumps/build/include/mumps_compat.h
  78 -
  79 -nobase_mumps_DATA = mumps/build/lib/libdmumps.a \
  80 -mumps/build/lib/libmumps_common.a \
  81 -mumps/build/lib/libpord.a \
  82 -mumps/build/libseq/libmpiseq.a \
  83 -bin/param.sdpa
  84 -# param.sdpa should installed into bin/
  85 -
  86  example_DATA = example1.dat-s example1.dat example1.ini \
  87  example1.ini-s example2.dat
  88
  89 @@ -68,5 +62,3 @@
  90  mex/mexSedumiWrap.cpp mex/mexsdpa.cpp \
  91  mex/mexAggSDPcones.cpp mex/mexDisAggSDPsol.cpp mex/mexFprintf.c \
  92  mex/param.m mex/read_data.m mex/sdpam.m mex/sedumiwrap.m
  93 -
  94 -