Changeset 107 for CMT/HEAD

Timestamp:

Oct 28, 2005, 4:57:59 PM (19 years ago)

Author:

arnault

Message:

Fix backward incompatible change in few make fragments

Location:

CMT/HEAD/mgr/fragments

Files:

• cleanup_header (modified) (1 diff)
• constituents_header (modified) (2 diffs)
• make_header (modified) (3 diffs)

CMT/HEAD/mgr/fragments/cleanup_header

@@ -4 +4 @@
         @cd .
 
-.DEFAULT::
-        @echo Using default action for $@
+#.DEFAULT::
+#       @echo Using default action for $@
 
 ${CONSTITUENT}clean ::

CMT/HEAD/mgr/fragments/constituents_header

@@ -23 +23 @@
 
 ifdef READONLY
-cmt_local_setup = /tmp/CMT_${PACKAGE}_setup$(cmt_lock_pid).make
-cmt_final_setup = /tmp/CMT_${PACKAGE}_setup.make
+cmt_local_setup = /tmp/CMT_${PACKAGE}setup$(cmt_lock_pid).make
+cmt_final_setup = /tmp/CMT_${PACKAGE}setup.make
 else
-cmt_local_setup = $(bin)${PACKAGE}_setup$(cmt_lock_pid).make
-cmt_final_setup = $(bin)${PACKAGE}_setup.make
+cmt_local_setup = $(bin)${PACKAGE}setup$(cmt_lock_pid).make
+cmt_final_setup = $(bin)${PACKAGE}setup.make
 endif
 
@@ -49 +49 @@
           echo CMTCONFIG=$(CMTCONFIG); \
           if test -f $(cmt_local_setup); then /bin/rm -f $(cmt_local_setup); fi; \
-          cmt_local_setup=$${bin}${PACKAGE}_setup$(cmt_lock_pid).make; \
-          cmt_final_setup=$${bin}${PACKAGE}_setup.make; \
+          cmt_local_setup=$${bin}${PACKAGE}setup$(cmt_lock_pid).make; \
+          cmt_final_setup=$${bin}${PACKAGE}setup.make; \
           trap '/bin/rm -f $${cmt_local_setup}' 0 1 2 15; \
           $(cmtexe) -quiet -tag=$(tags) show setup >>$${cmt_local_setup}; \

CMT/HEAD/mgr/fragments/make_header

@@ -51 +51 @@
 
 ifdef READONLY
-cmt_final_setup_${CONSTITUENT} = /tmp/CMT_${PACKAGE}_${CONSTITUENT}_setup.make
+cmt_final_setup_${CONSTITUENT} = /tmp/CMT_${PACKAGE}_${CONSTITUENT}setup.make
 cmt_local_${CONSTITUENT}_makefile = /tmp/CMT_${CONSTITUENT}$(cmt_lock_pid).make
 else
-cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_${CONSTITUENT}_setup.make
+cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_${CONSTITUENT}setup.make
 cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.make
 endif
@@ -61 +61 @@
 
 ifdef READONLY
-cmt_final_setup_${CONSTITUENT} = /tmp/CMT_${PACKAGE}_setup.make
+cmt_final_setup_${CONSTITUENT} = /tmp/CMT_${PACKAGE}setup.make
 cmt_local_${CONSTITUENT}_makefile = /tmp/CMT_${CONSTITUENT}$(cmt_lock_pid).make
 else
-cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_setup.make
+cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}setup.make
 cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.make
 endif
@@ -71 +71 @@
 
 ifdef READONLY
-cmt_final_setup = /tmp/CMT_${PACKAGE}_setup.make
+cmt_final_setup = /tmp/CMT_${PACKAGE}setup.make
 else
-cmt_final_setup = $(bin)${PACKAGE}_setup.make
+cmt_final_setup = $(bin)${PACKAGE}setup.make
 endif