summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorHans-Joachim Lankenau <hjs@openoffice.org>2000-09-21 13:03:04 +0000
committerHans-Joachim Lankenau <hjs@openoffice.org>2000-09-21 13:03:04 +0000
commitb0d11204f24ce3ffff9659afa442214d92f836c0 (patch)
tree7dcf0b0caaedc483001283cbbfca21292d6daad5 /solenv
parent1eb0d14c180d900e1121e2867f1f5861ad0d3763 (diff)
dos2unix lineend conversion
Diffstat (limited to 'solenv')
-rw-r--r--solenv/inc/target.mk20
1 files changed, 17 insertions, 3 deletions
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index 7a4f0249656f..ec5411c0d178 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -5,8 +5,8 @@
#* Beschreibung TARGET-Rules
#*
#* Ersterstellung TH 28.03.94
-#* Letzte Aenderung $Author: hjs $ $Date: 2000-09-21 13:12:00 $
-#* $Revision: 1.2 $
+#* Letzte Aenderung $Author: hjs $ $Date: 2000-09-21 14:03:04 $
+#* $Revision: 1.3 $
#*
#* $Logfile: T:/solar/inc/target.mkv $
#*
@@ -1669,6 +1669,12 @@ SDI5 ?= TNR!:=5
XMLPROPERTIESN:=$(foreach,i,$(XMLPROPERTIES) $(MISC)$/$(TARGET)_$(i:s/.xrb/.done/))
.ENDIF # "$(XMLPROPERTIES)"!=""
+.IF "$(UNIXTEXT)"!=""
+.IF "$(GUI)"=="UNX"
+CONVERTUNIXTEXT:=$(UNIXTEXT)
+.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(UNIXTEXT)"!=""
+
.IF "$(IDLFILES)"!=""
.IF "$(TF_PACKAGES)"!=""
.IF "$(NODEFAULTUNO)"==""
@@ -1856,7 +1862,7 @@ ALLTAR: $(MAKELANGDIR) $(MAKEDEMODIR) $(MAKECOMPDIR) $(MAKEXLDIR) \
$(PRJHIDTARGET) \
$(SIGNFORNETSCAPE) \
$(SIGNFOREXPLORER) \
- $(UNIXTEXT) \
+ $(CONVERTUNIXTEXT) \
last_target
.IF "$(EXCEPTIONSNOOPT_FLAG)"==""
@@ -1972,6 +1978,14 @@ $(MISC)$/s2u_$(TARGET).don:
.ENDIF # "$(TF_PACKAGES)"==""
+.IF "$(UNIXTEXT)"!=""
+$(UNIXTEXT) :
+ @+echo Making $@
+ @+-$(RM) -f $@ >& $(NULLDEV)
+ @+tr -d "\015" < $(@:f) > $@
+
+.ENDIF # "$(UNIXTEXT)"!=""
+
.IF "$(GUI)$(UPDATER)"=="WNTYES"
make_uno_doc:
# +-$(UNOIDL) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -Bdoc -P..$/$(PRJNAME)$/$(IDLPACKAGE) -OH$(PRJ)$/..$/unodoc $(DOCIDLFILES)