ChangeLogTag: Wed Jun 29 06:55:10 2005 Chad Elliott <elliott_c@ociweb.com>

4 files changed, 33 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 94164296..0f9ee34b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,18 +1,34 @@
+Wed Jun 29 06:55:10 2005  Chad Elliott  <elliott_c@ociweb.com>
+
+        * README:
+
+          Modified the documentation for 'specific' and 'conditional'.
+
+        * modules/WorkspaceCreator.pm:
+
+          Remove ./ from the beginning of located files and directories to
+          ensure that workspaces that change directory back to the original
+          go back to the correct directory.
+
+        * templates/make.mpd:
+
+          Only create the $(LTARGETDIR) rule if the project is not an exe.
+
 Tue Jun 28 11:33:07 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-	* templates/automake.mpd:
+        * templates/automake.mpd:
 
-	Sort custom type's output files so output is easier to inspect
-	when hand-tweaking MPC output.
+        Sort custom type's output files so output is easier to inspect
+        when hand-tweaking MPC output.
 
-	Add Pkgconfig_Files output to CLEANFILES.
+        Add Pkgconfig_Files output to CLEANFILES.
 
 Tue Jun 28 07:39:34 2005  Ming Xiong  <mxiong@tango.dre.vanderbilt.edu>
 
-	* config/ziparchive.mpb
+        * config/ziparchive.mpb
 
-	Added a .mpb file to support ziparchive feature which is needed by
-	DAnCE/ComponentPackager
+          Added a .mpb file to support ziparchive feature which is needed by
+          DAnCE/ComponentPackager.
 
 Tue Jun 28 07:20:08 2005  Chad Elliott  <elliott_c@ociweb.com>
 
diff --git a/README b/README
index 7c64a145..963bbf37 100644
--- a/README
+++ b/README
@@ -223,8 +223,8 @@ specific        This scope allows assignments that are specific to a
                   ...
                 }
 
-                Due to limited parsing capabilities, the else is required to
-                be on the same line as the closing curly brace.  You may
+                If the else is provided, it is required to be on
+                the same line as the closing curly brace.  You may
                 also negate the project type (using '!') which will cause
                 the specific to be evaluated for all types except the type
                 specified.
@@ -254,8 +254,8 @@ conditional     This scope allows addition of source files conditionally
                   ...
                 }
 
-                Due to limited parsing capabilities, the else is required to
-                be on the same line as the closing curly brace.  You may
+                If the else is provided, it is required to be on
+                the same line as the closing curly brace.  You may
                 also negate the project type (using '!') which will cause
                 the conditional to be evaluated for all types except the
                 type specified.
diff --git a/modules/WorkspaceCreator.pm b/modules/WorkspaceCreator.pm
index 555af58b..3b2b9373 100644
--- a/modules/WorkspaceCreator.pm
+++ b/modules/WorkspaceCreator.pm
@@ -609,11 +609,13 @@ sub search_for_files {
                          $self->{'exclude'}->{$self->{'wctype'}});
       $self->search_for_files(\@f, $array, $impl);
       if ($impl) {
+        $file =~ s/^\.\///;
         unshift(@$array, $file);
       }
     }
     else {
       if ($file =~ /\.mpc$/) {
+        $file =~ s/^\.\///;
         unshift(@$array, $file);
       }
     }
diff --git a/templates/make.mpd b/templates/make.mpd
index 13543911..33fcbfc3 100644
--- a/templates/make.mpd
+++ b/templates/make.mpd
@@ -40,6 +40,8 @@ DEPENDENCIES  = .depend.$(MAKEFILE)
 <%if(exename)%>
 BTARGETDIR    = <%if(install)%><%install%><%else%>.<%endif%><%slash%><%targetoutdir%>
 BIN           = $(BTARGETDIR)<%exename%>$(EXEEXT)
+<%else%>
+LTARGETDIR    = <%libout%><%slash%><%targetoutdir%>
 <%endif%>
 <%foreach(configurations)%>
 <%foreach(platforms)%>
@@ -51,7 +53,6 @@ EXEEXT        = <%exe_ext%>
 LIBPREFIX     = <%lib_prefix%>
 LDLIBS        =<%foreach(libs lit_libs)%> <%libopt%><%lib%><%endfor%><%foreach(pure_libs)%> <%pure_lib%><%endfor%> <%ldlibs%>
 OBJS          =<%if(pch_source && pchsupport)%> <%targetoutdir%><%noextension(pch_source)%>$(OBJEXT)<%endif%><%foreach(source_files)%> <%targetoutdir%><%noextension(source_file)%>$(OBJEXT)<%endfor%><%if(rc)%><%foreach(resource_files)%> <%targetoutdir%><%resource_file%>$(OBJEXT)<%endfor%><%endif%>
-LTARGETDIR    = <%libout%><%slash%><%targetoutdir%>
 <%if(lib_ext)%>
 <%if(staticname)%>
 AREXT         = <%lib_ext%>
@@ -116,9 +117,10 @@ $(BTARGETDIR):
 $(BIN): $(BTARGETDIR) <%foreach(configurations)%><%if(tempinc)%>$(TEMPINCDIR) <%endif%><%endfor%>$(OBJS) <%foreach(configurations)%><%foreach(platforms)%><%if(prelink)%><%targetoutdir%><%noextension(prelink)%>$(OBJEXT)<%endif%><%endfor%><%endfor%>
 	$(LINK.cc) $(OUTPUT_OPTION) $(OBJS) $(LDLIBS)
 
-<%endif%>
+<%else%>
 $(LTARGETDIR):
 	@$(MKDIR) "$@"
+<%endif%>
 
 <%foreach(configurations)%>
 <%foreach(platforms)%>