Changeset 814 for branches

Timestamp:

Jan 29, 2017, 8:05:03 PM (8 years ago)

Author:

djay

Message:

Merge small changes to branch-1.6 and tag-1.6.0

Location:

branches/branch-1.6

Files:

• . (modified) (1 prop)
• zoo-project/zoo-kernel/Makefile.in (modified) (2 diffs)
• zoo-project/zoo-kernel/configure.ac (modified) (1 diff)

branches/branch-1.6/zoo-project/zoo-kernel/Makefile.in

@@ -61 +61 @@
 service_internal_ms.o: service_internal_ms.c
         gcc ${JS_ENABLED} ${GDAL_CFLAGS}  ${JSCFLAGS} ${XML2CFLAGS} ${CFLAGS} -fPIC -c service_internal_ms.c
-        echo "SYMBOLSET\nEND" > sybols.sym
+        echo "SYMBOLSET\nEND" > symbols.sym
 
 service_internal_python.o: service_internal_python.c service.h
@@ -120 +120 @@
          if [ -e "libzoo_service.${EXT}" ]; then rm  libzoo_service.${EXT}; fi ; \
          ln -s ${LIBZOO_SERVICE} libzoo_service.${EXT})
-        if [ -z "${MS_FILE}" ] ; then echo "No symbols.sym" ; else install -d ${SHAREDSTATEDIR}; install symbols.sym ${SHAREDSTATEDIR}; fi
+        if [ -z "${MS_FILE}" ] ; then echo "No symbols.sym" ; else install -d ${DESTDIR}${SHAREDSTATEDIR}; install symbols.sym ${DESTDIR}${SHAREDSTATEDIR}; fi
         install -d ${DESTDIR}${INST_INCLUDE}/zoo
         install sqlapi.h service.h service_internal.h ${DESTDIR}${INST_INCLUDE}/zoo

branches/branch-1.6/zoo-project/zoo-kernel/configure.ac

@@ -928 +928 @@
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([ZOOMakefile.opts])
+AC_CONFIG_FILES([main.cfg])
 AC_OUTPUT