Flatten package archive structure - use existing script on new target…

…s in libs.

CMakeLists.txt - define a variable for "flatten" script location
libs - run the script on new targets
.travis.yml - revert NEKOPATH change, it is not needed with flat archive

.travis.yml

@@ -59,8 +59,7 @@ install:
       make source_archive_fat &&
       tar xf bin/neko-*-${TRAVIS_OS_NAME}*.tar.gz &&
       cd neko-*-${TRAVIS_OS_NAME}* &&
-      export PATH=`pwd`:$PATH &&
-      export NEKOPATH=$LD_LIBRARY_PATH:`pwd`/lib/neko;
+      export PATH=`pwd`:$PATH;
     else
       sudo make install;
     fi

CMakeLists.txt

@@ -679,12 +679,14 @@ if (RUN_LDCONFIG)
 	install(SCRIPT "${CMAKE_SOURCE_DIR}/cmake/ldconfig.cmake")
 endif()
 
+# A script to create a flat installation for archive package
+set (NEKO_FLATTEN_SCRIPT ${CMAKE_BINARY_DIR}/cmake/flatten.cmake)
 configure_file(
 	"${CMAKE_SOURCE_DIR}/cmake/flatten.cmake.in"
-	"${CMAKE_BINARY_DIR}/cmake/flatten.cmake"
+	${NEKO_FLATTEN_SCRIPT}
 	IMMEDIATE @ONLY)
 
-install(SCRIPT "${CMAKE_BINARY_DIR}/cmake/flatten.cmake")
+install(SCRIPT ${NEKO_FLATTEN_SCRIPT})
 
 # uninstall target
 configure_file(

libs/mod_neko/CMakeLists.txt

@@ -39,3 +39,4 @@ install (
 	DESTINATION ${DEST_NDLL}
 )
 
+install(SCRIPT ${NEKO_FLATTEN_SCRIPT})

libs/mod_tora/CMakeLists.txt

@@ -46,3 +46,5 @@ install (
 	TARGETS mod_tora2.ndll
 	DESTINATION ${DEST_NDLL}
 )
+
+install(SCRIPT ${NEKO_FLATTEN_SCRIPT})

libs/mysql/CMakeLists.txt

@@ -167,3 +167,5 @@ install (
 	TARGETS mysql.ndll mysql5.ndll
 	DESTINATION ${DEST_NDLL}
 )
+
+install(SCRIPT ${NEKO_FLATTEN_SCRIPT})

libs/regexp/CMakeLists.txt

@@ -71,3 +71,5 @@ install (
 	TARGETS regexp.ndll
 	DESTINATION ${DEST_NDLL}
 )
+
+install(SCRIPT ${NEKO_FLATTEN_SCRIPT})

libs/sqlite/CMakeLists.txt

@@ -50,3 +50,5 @@ install (
 	TARGETS sqlite.ndll
 	DESTINATION ${DEST_NDLL}
 )
+
+install(SCRIPT ${NEKO_FLATTEN_SCRIPT})

libs/ssl/CMakeLists.txt

@@ -74,3 +74,5 @@ install (
 	TARGETS ssl.ndll
 	DESTINATION ${DEST_NDLL}
 )
+
+install(SCRIPT ${NEKO_FLATTEN_SCRIPT})

libs/std/CMakeLists.txt

@@ -43,3 +43,5 @@ install (
 	TARGETS std.ndll
 	DESTINATION ${DEST_NDLL}
 )
+
+install(SCRIPT ${NEKO_FLATTEN_SCRIPT})

libs/ui/CMakeLists.txt

@@ -30,3 +30,5 @@ install (
 	TARGETS ui.ndll
 	DESTINATION ${DEST_NDLL}
 )
+
+install(SCRIPT ${NEKO_FLATTEN_SCRIPT})

libs/zlib/CMakeLists.txt

@@ -55,3 +55,5 @@ install (
 	TARGETS zlib.ndll
 	DESTINATION ${DEST_NDLL}
 )
+
+install(SCRIPT ${NEKO_FLATTEN_SCRIPT})