Changeset 816


Ignore:
Timestamp:
Jan 29, 2017, 9:05:01 PM (2 years ago)
Author:
djay
Message:

Merge branch-1.6 and rel-1.6.0 from trunk

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/branch-1.6

    • Property svn:mergeinfo changed
      /trunkmerged: 815
  • branches/branch-1.6/zoo-project/zoo-kernel/Makefile.in

    r814 r816  
    120120         if [ -e "libzoo_service.${EXT}" ]; then rm  libzoo_service.${EXT}; fi ; \
    121121         ln -s ${LIBZOO_SERVICE} libzoo_service.${EXT})
    122         if [ -z "${MS_FILE}" ] ; then echo "No symbols.sym" ; else install -d ${DESTDIR}${SHAREDSTATEDIR}; install symbols.sym ${DESTDIR}${SHAREDSTATEDIR}; fi
     122        if [ -z "${MS_FILE}" ] ; then echo "No symbols.sym" ; else install -d ${DESTDIR}${SHAREDSTATEDIR}; install -m644 symbols.sym ${DESTDIR}${SHAREDSTATEDIR}; fi
    123123        install -d ${DESTDIR}${INST_INCLUDE}/zoo
    124124        install sqlapi.h service.h service_internal.h ${DESTDIR}${INST_INCLUDE}/zoo
  • tags/rel-1.6.0

    • Property svn:mergeinfo changed
      /trunkmerged: 815
  • tags/rel-1.6.0/zoo-project/zoo-kernel/Makefile.in

    r814 r816  
    120120         if [ -e "libzoo_service.${EXT}" ]; then rm  libzoo_service.${EXT}; fi ; \
    121121         ln -s ${LIBZOO_SERVICE} libzoo_service.${EXT})
    122         if [ -z "${MS_FILE}" ] ; then echo "No symbols.sym" ; else install -d ${DESTDIR}${SHAREDSTATEDIR}; install symbols.sym ${DESTDIR}${SHAREDSTATEDIR}; fi
     122        if [ -z "${MS_FILE}" ] ; then echo "No symbols.sym" ; else install -d ${DESTDIR}${SHAREDSTATEDIR}; install -m644 symbols.sym ${DESTDIR}${SHAREDSTATEDIR}; fi
    123123        install -d ${DESTDIR}${INST_INCLUDE}/zoo
    124124        install sqlapi.h service.h service_internal.h ${DESTDIR}${INST_INCLUDE}/zoo
Note: See TracChangeset for help on using the changeset viewer.

Search

Context Navigation

ZOO Sponsors

http://www.zoo-project.org/trac/chrome/site/img/geolabs-logo.pnghttp://www.zoo-project.org/trac/chrome/site/img/neogeo-logo.png http://www.zoo-project.org/trac/chrome/site/img/apptech-logo.png http://www.zoo-project.org/trac/chrome/site/img/3liz-logo.png http://www.zoo-project.org/trac/chrome/site/img/gateway-logo.png

Become a sponsor !

Knowledge partners

http://www.zoo-project.org/trac/chrome/site/img/ocu-logo.png http://www.zoo-project.org/trac/chrome/site/img/gucas-logo.png http://www.zoo-project.org/trac/chrome/site/img/polimi-logo.png http://www.zoo-project.org/trac/chrome/site/img/fem-logo.png http://www.zoo-project.org/trac/chrome/site/img/supsi-logo.png http://www.zoo-project.org/trac/chrome/site/img/cumtb-logo.png

Become a knowledge partner

Related links

http://zoo-project.org/img/ogclogo.png http://zoo-project.org/img/osgeologo.png