From 643ec3cf04dfdd0148727195f6e2ed19aad80f2c Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Mon, 1 Jul 2002 08:14:09 +0000 Subject: [PATCH] Kayvan's WinXP fix to fdfix.sh. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4505 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/xforms/ChangeLog | 8 ++++++++ src/frontends/xforms/forms/Makefile.am | 2 +- src/frontends/xforms/forms/fdfix.sh | 6 ++++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index e891137b26..119d8d9a60 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,11 @@ +2002-07-01 Angus Leeming + + * forma/Makefile.am: keep "make clean" consistent with Kayvan's fix. + +2002-07-01 Kayvan A. Sylvan + + * forms/fdfix.sh: fix compilation failure on WinXP. + 2002-06-28 Angus Leeming * XPainter.[Ch]: changes associated with the name change diff --git a/src/frontends/xforms/forms/Makefile.am b/src/frontends/xforms/forms/Makefile.am index 0bc7e3a816..1fe63fa9e0 100644 --- a/src/frontends/xforms/forms/Makefile.am +++ b/src/frontends/xforms/forms/Makefile.am @@ -61,7 +61,7 @@ libfdesign.la: $(libfdesign_la_OBJECTS) $(libfdesign_la_DEPENDENCIES) $(SHELL) $(SCRIPT) $< clean-local: - rm -f *.[ChH] *.orig \ + rm -f *.[Ch] *.[ch]pp *.orig \ rm -f $(srcdir)/*.[hc] $(srcdir)/*.bak distclean-local: diff --git a/src/frontends/xforms/forms/fdfix.sh b/src/frontends/xforms/forms/fdfix.sh index 154fa09dbb..b0f653f1f6 100644 --- a/src/frontends/xforms/forms/fdfix.sh +++ b/src/frontends/xforms/forms/fdfix.sh @@ -61,7 +61,7 @@ fi # Modify the .h file for use by LyX HIN=${DIRNAME}/${BASENAME}.h HPATCH=${DIRNAME}/${BASENAME}.h.patch -HOUT=${BASENAME}.H +HOUT=${BASENAME}.hpp FDFIXH=${DIRNAME}/fdfixh.sed @@ -99,7 +99,8 @@ fi # Create the .C file for use by LyX CIN=${DIRNAME}/${BASENAME}.c CPATCH=${DIRNAME}/${BASENAME}.C.patch -COUT=${BASENAME}.C +COUT=${BASENAME}.cpp +FINAL_COUT=${BASENAME}.C FDFIXC=${DIRNAME}/fdfixc.sed @@ -137,5 +138,6 @@ fi # Clean up, to leave the finished .C file rm -f ${CIN} +mv ${COUT} ${FINAL_COUT} #========================================