Changeset 146 for CMT/HEAD

Timestamp:

Feb 10, 2006, 12:04:33 PM (18 years ago)

Author:

garonne

Message:

Fill <project>_installarea_linkopts in addition to cmt_installarea_linkopts see CL#297

File:

• CMT/HEAD/mgr/requirements (modified) (2 diffs)

CMT/HEAD/mgr/requirements

@@ -656 +656 @@
 
 cmtpath_pattern \
-  macro cmt_installarea_paths "$(cmt_installarea_prefix)/$(CMTCONFIG)/bin"
+  macro cmt_installarea_paths        " $(cmt_installarea_prefix)/$(CMTCONFIG)/bin" ; \
+  macro_prepend use_linkopts         " $(cmt_installarea_linkopts) " ; \
+  macro_append shlibbuilder          " $(cmt_installarea_linkopts) "
 
 cmtpath_pattern \
   macro_append cmt_installarea_paths "" <project>_with_installarea " $(<project>_installarea_prefix)/$(CMTCONFIG)/lib" ; \
   macro_append cmt_installarea_paths "" <project>_with_installarea " $(<project>_installarea_prefix)/share/lib" ; \
-  macro_append cmt_installarea_paths "" <project>_with_installarea " $(<project>_installarea_prefix)/share/bin" ; \
-  macro_prepend use_linkopts         "" <project>_with_installarea " $(<project>_installarea_linkopts) " ; \
-  macro_append shlibbuilder          "" <project>_with_installarea " $(<project>_installarea_linkopts) "
-
+  macro_append cmt_installarea_paths "" <project>_with_installarea " $(<project>_installarea_prefix)/share/bin"
+  
 macro CMT_PATH_remove_regexp "/[^/]*/" WIN32 "\\[^\\]*\\"
 macro CMT_PATH_remove_share_regexp "/share/" WIN32 "\\share\\"
@@ -691 +691 @@
                 <project>_without_installarea "" \
                 <project>_with_installarea&Unix " -L<path>/$(<project>_installarea_prefix)/$(CMTCONFIG)/lib " \
-                <project>_with_installarea&WIN32 " /LIBPATH:<path>\$(<project>_installarea_prefix)\$(CMTCONFIG)\lib " ; \
-  macro_prepend <project>_installarea_linkopts "" \
-                <project>_without_installarea "" \
-                <project>_with_installarea&Unix " -L<path>/$(<project>_installarea_prefix)/$(CMTCONFIG)/lib " \
-                <project>_with_installarea&WIN32 " /LIBPATH:<path>\$(<project>_installarea_prefix)\$(CMTCONFIG)\lib " ; \
-
-
+                <project>_with_installarea&WIN32 " /LIBPATH:<path>\$(<project>_installarea_prefix)\$(CMTCONFIG)\lib "                 
+    
 set NEWCMTCONFIG "${cmt_hardware}-${cmt_system_version}-${cmt_compiler_version}"