Kayvan's WinXP fix to fdfix.sh.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4505 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index e891137b2607f1a91343b606802835f707bd7cf3..119d8d9a60c767795e654d8f945fde86c28df67c 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,11 @@
+2002-07-01  Angus Leeming  <leeming@lyx.org>
+
+       * forma/Makefile.am: keep "make clean" consistent with Kayvan's fix.
+
+2002-07-01  Kayvan A. Sylvan  <kayvan@sylvan.com>
+
+       * forms/fdfix.sh: fix compilation failure on WinXP.
+
 2002-06-28  Angus Leeming  <leeming@lyx.org>
 
        * 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 0bc7e3a816412d89a30e13406b00bb2da93dfd49..1fe63fa9e0d5aed07229f35e2621b39c669ae1b1 100644 (file)
--- 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 154fa09dbb191a7eb325cac2e1780a2718b5f3a6..b0f653f1f6fd13a9478921d21dd72f2089876eb4 100644 (file)
--- 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}
 
 #========================================