[Zrouter-src] ZRouter.org: push to ZRouter share/mk/zrouter.packing.mk

[zrouter-src at zrouter.org]

details:   http://zrouter.org/hg/zrouter//rev/d3d889409e37
changeset: 261:d3d889409e37
user:      ray at terran.dlink.ua
date:      Fri Dec 09 17:24:35 2011 +0200
description:
fix, look suffixes only for files(not for dir path :) )

diffstat:

 share/mk/zrouter.packing.mk |  14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diffs (33 lines):

diff -r b216f12b406d -r d3d889409e37 share/mk/zrouter.packing.mk
--- a/share/mk/zrouter.packing.mk	Fri Dec 09 17:23:36 2011 +0200
+++ b/share/mk/zrouter.packing.mk	Fri Dec 09 17:24:35 2011 +0200
@@ -15,15 +15,29 @@
 NEW_CURRENT_PACKING_FILE_NAME:=${CURRENT_PACKING_FILE_NAME:R}
 # Get last suffix
 CURRENT_PACKING_FILE_SUFFIX:=${CURRENT_PACKING_FILE_NAME:E}
+
+# Check if we try split dir path intead of filename only
+_DIR!=dirname ${CURRENT_PACKING_FILE_NAME}
+_NEW_DIR!=dirname ${NEW_CURRENT_PACKING_FILE_NAME}
+.if !empty(_DIR) && !empty(_NEW_DIR) && ${_DIR} != ${_NEW_DIR}
+.warning "${_DIR}" != "${_NEW_DIR}"
+# Reset CURRENT_PACKING_FILE_SUFFIX to break loop
+CURRENT_PACKING_FILE_SUFFIX=
+.endif
+
 .if !empty(CURRENT_PACKING_FILE_SUFFIX) && ${CURRENT_PACKING_FILE_SUFFIX} != ""
+
 #.warning From file ${NEW_CURRENT_PACKING_FILE_NAME}, to file ${CURRENT_PACKING_FILE_NAME}, with converter "${CURRENT_PACKING_FILE_SUFFIX}".
 .if exists(${ZROUTER_ROOT}/share/mk/converters/${CURRENT_PACKING_FILE_SUFFIX}.mk)
+
 .warning Will convert file ${NEW_CURRENT_PACKING_FILE_NAME}, with converter "${CURRENT_PACKING_FILE_SUFFIX}".
 # Invoke converter for that suffix
 .include "${ZROUTER_ROOT}/share/mk/converters/${CURRENT_PACKING_FILE_SUFFIX}.mk"
+
 .else
 .error "Converter for suffix '${CURRENT_PACKING_FILE_SUFFIX}' undefined"
 .endif
+
 CURRENT_PACKING_FILE_NAME:=${NEW_CURRENT_PACKING_FILE_NAME}
 .endif
 .endfor # CURRENT_ITEM in ${LIST}