Changeset 814


Ignore:
Timestamp:
Jan 29, 2017, 8:05:03 PM (3 years ago)
Author:
djay
Message:

Merge small changes to branch-1.6 and tag-1.6.0

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/branch-1.6

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

    r812 r814  
    6161service_internal_ms.o: service_internal_ms.c
    6262        gcc ${JS_ENABLED} ${GDAL_CFLAGS}  ${JSCFLAGS} ${XML2CFLAGS} ${CFLAGS} -fPIC -c service_internal_ms.c
    63         echo "SYMBOLSET\nEND" > sybols.sym
     63        echo "SYMBOLSET\nEND" > symbols.sym
    6464
    6565service_internal_python.o: service_internal_python.c service.h
     
    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 ${SHAREDSTATEDIR}; install symbols.sym ${SHAREDSTATEDIR}; fi
     122        if [ -z "${MS_FILE}" ] ; then echo "No symbols.sym" ; else install -d ${DESTDIR}${SHAREDSTATEDIR}; install 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
  • branches/branch-1.6/zoo-project/zoo-kernel/configure.ac

    r812 r814  
    928928AC_CONFIG_FILES([Makefile])
    929929AC_CONFIG_FILES([ZOOMakefile.opts])
     930AC_CONFIG_FILES([main.cfg])
    930931AC_OUTPUT
  • tags/rel-1.6.0

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

    r812 r814  
    6161service_internal_ms.o: service_internal_ms.c
    6262        gcc ${JS_ENABLED} ${GDAL_CFLAGS}  ${JSCFLAGS} ${XML2CFLAGS} ${CFLAGS} -fPIC -c service_internal_ms.c
    63         echo "SYMBOLSET\nEND" > sybols.sym
     63        echo "SYMBOLSET\nEND" > symbols.sym
    6464
    6565service_internal_python.o: service_internal_python.c service.h
     
    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 ${SHAREDSTATEDIR}; install symbols.sym ${SHAREDSTATEDIR}; fi
     122        if [ -z "${MS_FILE}" ] ; then echo "No symbols.sym" ; else install -d ${DESTDIR}${SHAREDSTATEDIR}; install 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/zoo-project/zoo-kernel/configure.ac

    r812 r814  
    928928AC_CONFIG_FILES([Makefile])
    929929AC_CONFIG_FILES([ZOOMakefile.opts])
     930AC_CONFIG_FILES([main.cfg])
    930931AC_OUTPUT
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