From b657fb1c1f9d7b4832d68cb1cbbe6ad3b4a77803 Mon Sep 17 00:00:00 2001 From: NicJA Date: Fri, 6 Feb 2015 21:51:25 +0000 Subject: [PATCH] set execute for all to prevent permission issues on darwin. use cat to merge the parts before using sed, since some sed's have a problem with this and only output the first part of the file. git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@50042 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- tools/sfdc/Makefile | 4 ++-- tools/sfdc/Makefile.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/sfdc/Makefile b/tools/sfdc/Makefile index 64ca35d829..b46d1734b6 100644 --- a/tools/sfdc/Makefile +++ b/tools/sfdc/Makefile @@ -10,8 +10,8 @@ PODS = SFDCompile.pod all : $(SFDC) $(SFDC) : $(MAIN) $(CLASSES) $(PODS) - @$(SED) "s/SFDC_VERSION/$(VERSION)/g" $^ | sed "s/SFDC_DATE/$(DATE)/g" >$@ - @$(CHMOD) +x $@ + @cat $^ | $(SED) "s/SFDC_VERSION/$(VERSION)/g" | $(SED) "s/SFDC_DATE/$(DATE)/g" >$@ + @$(CHMOD) a+x $@ clean: @$(RM) -f $(SFDC) diff --git a/tools/sfdc/Makefile.in b/tools/sfdc/Makefile.in index 5833d462ab..601c464f73 100644 --- a/tools/sfdc/Makefile.in +++ b/tools/sfdc/Makefile.in @@ -52,7 +52,7 @@ lha: all tgz $(MAN) $(TXT) $(EXECUTABLE)-$(VERSION).tar.gz $(EXECUTABLE): $(MAIN) $(CLASSES) $(PODS) - sed "s/SFDC_VERSION/$(VERSION)/g" $^ | sed "s/SFDC_DATE/$(DATE)/g" >$@ + cat $^ | sed "s/SFDC_VERSION/$(VERSION)/g" | sed "s/SFDC_DATE/$(DATE)/g" >$@ chmod a+x $@ $(MAN): $(EXECUTABLE) -- 2.11.4.GIT