Changeset 74


Ignore:
Timestamp:
Jul 1, 2008 5:40:01 PM (11 years ago)
Author:
ladanyi
Message:
 
Location:
trunk/CoinMP
Files:
1 deleted
3 edited
4 copied

Legend:

Unmodified
Added
Removed
  • trunk/CoinMP/Makefile.am

    r42 r74  
    2929# Here we need include all files that are not mentioned in other Makefiles
    3030
    31 EXTRA_DIST =
     31EXTRA_DIST = \
     32        examples/Makefile \
     33        examples/example.cpp
    3234
    3335########################################################################
     
    5052########################################################################
    5153#                  Installation of the addlibs file                    #
     54#                  Installation of the examples dir                    #
    5255########################################################################
    5356
    5457addlibsfile = coinmp_addlibs.txt
     58addlibsdir = $(prefix)/share/doc/coin/$(PACKAGE_NAME)
     59
     60examplefiles = $(srcdir)/examples/Makefile $(srcdir)/examples/example.cpp
     61examplesdir = $(prefix)/examples/$(PACKAGE_NAME)
    5562
    5663install-exec-local:
    57         $(install_sh_DATA) $(addlibsfile) $(DESTDIR)$(libdir)/$(addlibsfile)
     64        $(install_sh_DATA) $(addlibsfile) $(DESTDIR)$(addlibsdir)/$(addlibsfile)
     65        $(install_sh_DATA) $(examplefiles) $(DESTDIR)$(examplesdir)
    5866
    5967uninstall-local:
    60         rm -f $(DESTDIR)$(libdir)/$(addlibsfile)
     68        rm -f $(DESTDIR)$(addlibsdir)/$(addlibsfile)
     69        rm -f $(DESTDIR)$(examplesdir)
    6170
    6271########################################################################
  • trunk/CoinMP/configure.ac

    r73 r74  
    1313AC_PREREQ(2.59)
    1414
    15 AC_INIT([CoinMP],[0.1],[coin-discuss@list.coin-or.org])
     15AC_INIT([CoinMP],[trunk],[coin-discuss@list.coin-or.org])
    1616
    1717AC_COPYRIGHT([
     
    109109
    110110##############################################################################
    111 #                   VPATH links for example input files                      #
    112 ##############################################################################
    113 
    114 # In case this is a VPATH configuration we need to make sure that the
    115 # input files for the examples are available in the VPATH directory.
    116 
    117 #AC_COIN_VPATH_LINK(examples/fixed.dat)
    118 #AC_COIN_VPATH_LINK(examples/train.dat)
    119 
    120 ##############################################################################
    121111#                   Finishing up by writing all the output                   #
    122112##############################################################################
  • trunk/CoinMP/src/Makefile.am

    r73 r74  
    7474# Here list all the header files that are required by a user of the library,
    7575# and that therefore should be installed in 'install'
    76 include_HEADERS = \
     76includecoindir = $(includedir)/coin
     77includecoin_HEADERS = \
    7778        ../inc/config_coinmp.h \
    7879        CoinMP.h
     
    9091        echo "#endif" >> bla
    9192        cat $(srcdir)/$(ConfigHeader) >> bla
    92         $(install_sh_DATA) bla $(DESTDIR)$(includedir)/$(ConfigHeader)
     93        $(install_sh_DATA) bla $(DESTDIR)$(includecoindir)/$(ConfigHeader)
    9394        rm -f bla
    9495
    9596uninstall-local:
    96         rm -f $(DESTDIR)$(includedir)/$(ConfigHeader)
     97        rm -f $(DESTDIR)$(includecoindir)/$(ConfigHeader)
Note: See TracChangeset for help on using the changeset viewer.