summaryrefslogtreecommitdiff
path: root/misc/openoffice2/patches/patch-ai
blob: e97275a976dad9dc8f0c352eebd4b096b73b9472 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
$NetBSD: patch-ai,v 1.4 2007/10/06 20:02:22 hira Exp $

--- solenv/inc/tg_app.mk.orig	2007-07-02 18:23:33.000000000 +0900
+++ solenv/inc/tg_app.mk	2007-09-26 17:53:57.000000000 +0900
@@ -131,7 +131,7 @@
 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
 	@echo $(APP$(TNR)LINKER) $(APP$(TNR)LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
 	$(APP$(TNR)OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
-	@cat $(mktmp /dev/null $(APP$(TNR)LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
+	@cat $(mktmp /dev/null $(APP$(TNR)LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
 	@echo $(APP$(TNR)LINKTYPEFLAG) $(APP$(TNR)LIBSALCPPRT) $(APP$(TNR)STDLIBS) $(APP$(TNR)STDLIB) $(STDLIB$(TNR)) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
 	cat $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
 	@+source $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd