diff options
Diffstat (limited to 'unix/Makefile.in')
| -rw-r--r-- | unix/Makefile.in | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 7d75bc8..6f75076 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -616,8 +616,14 @@ ${TK_ZIP_FILE}: ${ZIP_INSTALL_OBJS} then : ; else \ cp -a $(TOP_DIR)/library/* ${TK_VFS_PATH}; \ fi + rm -rf ${TK_VFS_PATH}/demos @find ${TK_VFS_ROOT} -type d -empty -delete @echo "creating ${TK_ZIP_FILE} from ${TK_VFS_PATH}" + @if test "${ZIPFS_BUILD}" = "2" ; then \ + (zip=`(realpath '${NATIVE_ZIP}' || readlink -m '${NATIVE_ZIP}') 2>/dev/null || \ + (echo '${NATIVE_ZIP}' | sed "s?^\./?$$(pwd)/?")`; \ + cd ${TK_VFS_ROOT} && cp ${BUILD_TCLSH} ../${TK_ZIP_FILE} && $$zip -J ../${TK_ZIP_FILE}) \ + fi @(zip=`(realpath '${NATIVE_ZIP}' || readlink -m '${NATIVE_ZIP}' || \ echo '${NATIVE_ZIP}' | sed "s?^\./?$$(pwd)/?") 2>/dev/null`; \ echo 'cd ${TK_VFS_ROOT} &&' $$zip '${ZIP_PROG_OPTIONS} ../${TK_ZIP_FILE} ${ZIP_PROG_VFSSEARCH}'; \ @@ -667,6 +673,11 @@ objs: ${OBJS} ${WISH_EXE}: $(TK_STUB_LIB_FILE) $(WISH_OBJS) $(TK_LIB_FILE) @APP_RSRC_FILE@ ${CC} ${CFLAGS} ${LDFLAGS} $(WISH_OBJS) @TK_BUILD_LIB_SPEC@ \ $(WISH_LIBS) $(CC_SEARCH_FLAGS) -o ${WISH_EXE} + @if test "${ZIPFS_BUILD}" = "2" ; then \ + cat ${TK_ZIP_FILE} >> ${WISH_EXE}; \ + ${NATIVE_ZIP} -A ${WISH_EXE} \ + || echo 'ignore zip-error by adjust sfx process (not executable?)'; \ + fi # Resetting the LIB_RUNTIME_DIR below is required so that # the generated tktest executable gets the build directory @@ -1084,6 +1095,7 @@ tkPkgConfig.o: $(GENERIC_DIR)/tkPkgConfig.c -DCFG_RUNTIME_SCRDIR="\"$(TK_LIBRARY)\"" \ -DCFG_RUNTIME_INCDIR="\"$(includedir)\"" \ -DCFG_RUNTIME_DOCDIR="\"$(mandir)\"" \ + -DCFG_RUNTIME_DLLFILE="\"$(TK_LIB_FILE)\"" \ -DCFG_RUNTIME_DEMODIR="\"$(DEMO_INSTALL_DIR)\"" \ \ $(GENERIC_DIR)/tkPkgConfig.c |