diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2003-12-16 14:29:51 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2003-12-16 14:29:51 +0000 |
| commit | 41ab810d7c417182a3c6404d350a7b689d2176bf (patch) | |
| tree | f0613264f4704c45a75947d6003f32cbf35dd9a3 | |
| parent | cf6abc9f2c0de9ad24623de22acdf7a0b836d748 (diff) | |
| download | ATCD-41ab810d7c417182a3c6404d350a7b689d2176bf.tar.gz | |
ChangeLogTag: Tue Dec 16 08:29:05 2003 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/templates/make.mpd | 18 |
2 files changed, 18 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index e5994095a55..d871eca48e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue Dec 16 08:29:05 2003 Chad Elliott <elliott_c@ociweb.com> + + * bin/MakeProjectCreator/templates/make.mpd: + + Fixed the install targets when installing to the current + directory. + Tue Dec 16 07:13:53 2003 Chad Elliott <elliott_c@ociweb.com> * ace/TMCast/TMCast.mpc: diff --git a/bin/MakeProjectCreator/templates/make.mpd b/bin/MakeProjectCreator/templates/make.mpd index 321636abf0b..779a1025b30 100644 --- a/bin/MakeProjectCreator/templates/make.mpd +++ b/bin/MakeProjectCreator/templates/make.mpd @@ -136,18 +136,22 @@ $(LIB): $(OBJS) <%if(exename)%> INSTARGET = $(BIN) install: - @echo "Installing $(INSTARGET) -> <%install%>/$(INSTARGET)" - @-test -d "<%install%>" || mkdir -p "<%install%>" 2> /dev/null || true - @$(RM) "<%install%>/$(INSTARGET)" - @ln -s "$(PWD)/$(INSTARGET)" "<%install%>" + @if [ "<%install%>" != "." ]; then \ + echo "Installing $(INSTARGET) -> <%install%>/$(INSTARGET)"; \ + -test -d "<%install%>" || mkdir -p "<%install%>" 2> /dev/null || true; \ + $(RM) "<%install%>/$(INSTARGET)"; \ + ln -s "$(PWD)/$(INSTARGET)" "<%install%>"; \ + fi <%endif%> <%else%> <%if(!exename)%> install: - @-test -d "<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>" || mkdir -p "<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>" 2> /dev/null || true - @$(RM) "<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>/$(INSTARGET)" - @ln -s "$(PWD)/$(INSTARGET)" "<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>" + @if [ "<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>" != "." ]; then \ + test -d "<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>" || mkdir -p "<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>" 2> /dev/null || true; \ + $(RM) "<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>/$(INSTARGET)"; \ + ln -s "$(PWD)/$(INSTARGET)" "<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>"; \ + fi <%endif%> <%endif%> |