diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2000-10-10 10:14:39 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2000-10-10 10:14:39 +0000 |
| commit | 2ef54da348855d008abfe9c3c80162cb5778e703 (patch) | |
| tree | f0b0b6cd815f3232ba3378534127d38d293af301 /solenv/inc/tg_lib.mk | |
| parent | 124d4837da6f1017f9b70c91d8c781f416a81bb8 (diff) | |
2nd try to fix the sed command
Diffstat (limited to 'solenv/inc/tg_lib.mk')
| -rw-r--r-- | solenv/inc/tg_lib.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/solenv/inc/tg_lib.mk b/solenv/inc/tg_lib.mk index bcba37453b5e..f5025de3d229 100644 --- a/solenv/inc/tg_lib.mk +++ b/solenv/inc/tg_lib.mk @@ -50,19 +50,19 @@ $(LIB$(TNR)TARGET) : $(LIB$(TNR)FILES) \ .ENDIF .IF "$(GUI)"=="UNX" @+$(RM) $@ - @+echo $(LIB$(TNR)OBJFILES:s/.obj/.o/) | sed s\#$(PRJ)$/$(ROUT)\#$(ROUT)\#g | xargs -n 1 > $@ + @+echo $(LIB$(TNR)OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@ @+cat /dev/null $(LIB$(TNR)FILES:s/.obj/.o/) | xargs -n 1 >> $@ @+$(RM) $(@:d)$(@:b).dump - @+nm `cat $(LIB$(TNR)TARGET) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump + @+nm `cat $(LIB$(TNR)TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump .IF "$(LIB$(TNR)ARCHIV)" != "" @+-$(RM) $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd .IF "$(OS)" =="HPUX_FRAG_HR" @+-$(RM) $(MISC)$/$(LIB$(TNR)ARCHIV:b)_closetempl.cmd - @+echo $(LINK) +inst_close -c `cat $(LIB$(TNR)TARGET) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB$(TNR)ARCHIV:b)_closetempl.cmd + @+echo $(LINK) +inst_close -c `cat $(LIB$(TNR)TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB$(TNR)ARCHIV:b)_closetempl.cmd @cat $(MISC)$/$(LIB$(TNR)ARCHIV:b)_closetempl.cmd @source $(MISC)$/$(LIB$(TNR)ARCHIV:b)_closetempl.cmd .ENDIF - @+echo $(LIBMGR) $(LIB$(TNR)FLAGS) $(LIBFLAGS) $(LIB$(TNR)ARCHIV) `cat $(LIB$(TNR)TARGET) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd + @+echo $(LIBMGR) $(LIB$(TNR)FLAGS) $(LIBFLAGS) $(LIB$(TNR)ARCHIV) `cat $(LIB$(TNR)TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd .IF "$(OS)$(COM)"=="NETBSDGCC" @+echo ranlib $(LIB$(TNR)ARCHIV) >> $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd .ENDIF @@ -72,11 +72,11 @@ $(LIB$(TNR)TARGET) : $(LIB$(TNR)FILES) \ .ELSE # "$(GUI)"=="UNX" .IF "$(GUI)"=="MAC" @+$(RM) $@ - @+echo $(LIB$(TNR)OBJFILES) | sed s\#$(PRJ)$/$(ROUT)\#$(ROUT)\#g | xargs -n 1 > $@ + @+echo $(LIB$(TNR)OBJFILES) | sed s\#$(PRJ:s/./\./)$/$(ROUT)\#$(ROUT)\#g | xargs -n 1 > $@ @+cat /dev/null $(LIB$(TNR)FILES) | xargs -n 1 >> $@ .IF "$(LIB$(TNR)ARCHIV)" != "" @+$(RM) $(LIB$(TNR)ARCHIV) - +$(LIBMGR) $(LIBFLAGS) -o $(shell $(UNIX2MACPATH) $(LIB$(TNR)ARCHIV) `cat /dev/null $@ | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g`) + +$(LIBMGR) $(LIBFLAGS) -o $(shell $(UNIX2MACPATH) $(LIB$(TNR)ARCHIV) `cat /dev/null $@ | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g`) .ENDIF # "$(LIB$(TNR)ARCHIV)" != "" .ELSE # "$(GUI)"=="MAC" .IF "$(COM)" == "BLC" |