From d6bb88b615b762a3d62f13fa5d6ca28cb8efdcd2 Mon Sep 17 00:00:00 2001 From: amrein Date: Thu, 26 Jan 2017 16:38:06 +0000 Subject: [PATCH] Add suffix back on 'sed -i' command to be Mac OS X compatible git-svn-id: svn://ultimatepp.org/upp/trunk@10772 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppbox/Scripts/domake | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/uppbox/Scripts/domake b/uppbox/Scripts/domake index 8a3380fdd..592d107fe 100755 --- a/uppbox/Scripts/domake +++ b/uppbox/Scripts/domake @@ -383,14 +383,15 @@ fi if [ "$platform" = "Darwin" ] then log_debug_info "Adjusting Makefile/uMakefile for Mac OS X" - sed -i -E -e 's/(-Wl,[^[:space:]]*)//g' -e 's/-lrt//g' uppsrc/Makefile uppsrc/uMakefile + sed -i.backup -E -e 's/(-Wl,[^[:space:]]*)//g' -e 's/-lrt//g' uppsrc/Makefile uppsrc/uMakefile fi if [[ "$Macro" == *"-DflagNOGTK"* ]] then log_debug_info "Removing references to GTK+" - sed -i -e 's/-lgtk-x11-2.0//g' \ + sed -i.backup \ + -e 's/-lgtk-x11-2.0//g' \ -e 's/-lgdk-x11-2.0//g' \ -e 's/-latk-1.0//g' \ -e 's/-lgdk_pixbuf-2.0//g' \ @@ -405,11 +406,12 @@ fi if [ ! -f /usr/lib/libdl.so -a ! -f /usr/lib64/libdl.so ] then - sed -i -e s/-ldl//g uppsrc/Makefile - sed -i -e s/-ldl//g uppsrc/uMakefile + sed -i.backup -e s/-ldl//g uppsrc/Makefile + sed -i.backup -e s/-ldl//g uppsrc/uMakefile fi +rm -f uppsrc/*.backup log_debug_info "Searching for gmake or make"