From 16c331c18590be4dd6bd42b8eaa0b83065a424ba Mon Sep 17 00:00:00 2001
From: Hans-Joachim Lankenau <hjs@openoffice.org>
Date: Wed, 6 Mar 2002 11:52:55 +0000
Subject: #i3114# accept different output namings (bison ver 1.2x/1.3x)

---
 solenv/inc/tg_yxx.mk | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'solenv/inc/tg_yxx.mk')

diff --git a/solenv/inc/tg_yxx.mk b/solenv/inc/tg_yxx.mk
index 3acb75803f05..eb6380a13121 100644
--- a/solenv/inc/tg_yxx.mk
+++ b/solenv/inc/tg_yxx.mk
@@ -3,12 +3,10 @@
 $(YACCTARGET): $(YACCFILES)
     @echo ------------------------------
     @echo Making: $@
-#.IF "$(GUI)"!="UNX"
-    $(BISON) $(YACCFLAGS) $(YACCOUT)$/$(YACCTARGET) $(YACCFILES)
-#.ELSE
-#	$(BISON) $(YACCFLAGS) $(YACCFILES)
-#	mv y.tab.c $(INCCOM)/rscyacc.yxx
-#	mv y.tab.h $(INCCOM)/yytab.h
-#.ENDIF
+    $(BISON) $(YACCFLAGS) $(YACCTARGET) $(YACCFILES)
+# removing -f switch - avoid getting nothing when copying a file to itself
+    @+-$(COPY:s/-f//) $@.h $(INCCOM)$/$(@:b).hxx >& $(NULLDEV)
+    @+-$(COPY:s/-f//) $(@:d)$/$(@:b).hxx $(INCCOM)$/$(@:b).hxx >& $(NULLDEV)
+    +$(TYPE) $(INCCOM)$/$(@:b).hxx >& $(NULLDEV)
 .ENDIF
 
-- 
cgit