Changeset 591 for CMT/HEAD/mgr

Timestamp:

Nov 29, 2011, 10:07:38 AM (13 years ago)

Author:

rybkin

Message:

See C.L. 468

Location:

CMT/HEAD/mgr

Files:

• cmt_make_shlib_common.sh (modified) (1 diff)
• cmt_uninstall_action.sh (modified) (1 diff)
• fragments/library (modified) (1 diff)

CMT/HEAD/mgr/cmt_make_shlib_common.sh

@@ -34 +34 @@
 fi
 
-ld=`${CMTROOT}/mgr/cmt show macro_value shlibbuilder -tag=${tag}` || exit
-ldflags=`${CMTROOT}/mgr/cmt show macro_value shlibflags -tag=${tag}` || exit
-suffix=`${CMTROOT}/mgr/cmt show macro_value shlibsuffix -tag=${tag}` || exit
-libprefix=`${CMTROOT}/mgr/cmt show macro_value library_prefix -tag=${tag}` || exit
-libsuffix=`${CMTROOT}/mgr/cmt show macro_value library_suffix -tag=${tag}` || exit
+[ -n "${ld:-}" ] || ld=`${CMTROOT}/mgr/cmt show macro_value shlibbuilder -tag=${tag}` || exit
+[ -n "${ldflags+CMT}" ] || ldflags=`${CMTROOT}/mgr/cmt show macro_value shlibflags -tag=${tag}` || exit
+[ -n "${suffix+CMT}" ] || suffix=`${CMTROOT}/mgr/cmt show macro_value shlibsuffix -tag=${tag}` || exit
+[ -n "${libprefix+CMT}" ] || libprefix=`${CMTROOT}/mgr/cmt show macro_value library_prefix -tag=${tag}` || exit
+[ -n "${libsuffix+CMT}" ] || libsuffix=`${CMTROOT}/mgr/cmt show macro_value library_suffix -tag=${tag}` || exit
 
 libname=${libprefix}${lib}${libsuffix}

CMT/HEAD/mgr/cmt_uninstall_action.sh

@@ -97 +97 @@
 
   if test "${cmtpath}" = ""; then
-    package=`cmt show macro_value package`
-    cmtpath=`cmt show macro_value ${package}_cmtpath`
+    if [ -n "${CMTDEBUG:-}" ]; then
+      unset CMTDEBUG
+      set -x
+    fi
+    package=`cmt show macro_value package` || exit
+    cmtpath=`cmt show macro_value ${package}_cmtpath` || exit
   fi
 

CMT/HEAD/mgr/fragments/library

@@ -29 +29 @@
 $(${CONSTITUENT}libname).$(shlibsuffix) :: $(${CONSTITUENT}lib) requirements $(use_requirements) $(${CONSTITUENT}stamps)
         $(lib_echo) "shared library $@"
-        $(lib_silent) if test "$(makecmd)"; then QUIET=; else QUIET=1; fi; QUIET=$${QUIET} bin=$(bin) $(make_shlib) "$(tags)" ${CONSTITUENT} $(${CONSTITUENT}_shlibflags)
+        $(lib_silent) if test "$(makecmd)"; then QUIET=; else QUIET=1; fi; QUIET=$${QUIET} bin="$(bin)" ld="$(shlibbuilder)" ldflags="$(shlibflags)" suffix=$(shlibsuffix) libprefix=$(library_prefix) libsuffix=$(library_suffix) $(make_shlib) "$(tags)" ${CONSTITUENT} $(${CONSTITUENT}_shlibflags)
 
 $(${CONSTITUENT}shstamp) :: $(${CONSTITUENT}libname).$(shlibsuffix)