diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index d06075e4dc..0c68146ba2 100644
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-02  Lars Gullik Bjønnes  <larsbj@lyx.org>
+
+	* forms/Makefile.am (.fd.C): Use '-r' to test for file existence,
+	and use $(<F) instead of `basename $<`
+
 2004-06-01  Angus Leeming  <leeming@lyx.org>
 
 	* LayoutEngine.C (c-tor): initialize visible_ as false.
diff --git a/src/frontends/xforms/forms/Makefile.am b/src/frontends/xforms/forms/Makefile.am
index 5ea2798ecc..45a0151d59 100644
--- a/src/frontends/xforms/forms/Makefile.am
+++ b/src/frontends/xforms/forms/Makefile.am
@@ -63,5 +63,5 @@ SCRIPT = $(srcdir)/fdfix.sh
 SUFFIX = .fd
 
 .fd.C: $(srcdir)/fdfix.sh $(srcdir)/fdfix[ch].sed $(srcdir)/tmp_str.sed
-	{ [ $(srcdir) != . ] && [ ! -a $(<F) ] && $(LN_S) $< . ; } || true
-	$(SHELL) $(SCRIPT) `basename $<`
+	{ [ $(srcdir) != . ] && [ ! -r $(<F) ] && $(LN_S) $< . ; } || true
+	$(SHELL) $(SCRIPT) $(<F)