Changeset 19296

Timestamp:

08/30/06 11:27:21 (2 years ago)

Author:

dshipton

Message:

Add in extra check to see if the guess we make is good for the fpc file…if not then don't use a —from-file at all

Files:

• juggler/trunk/macros/gadget.m4 (modified) (1 diff)
• juggler/trunk/macros/jccl.m4 (modified) (1 diff)
• juggler/trunk/macros/sonix.m4 (modified) (1 diff)
• juggler/trunk/macros/tweek.m4 (modified) (1 diff)
• juggler/trunk/macros/vpr.m4 (modified) (1 diff)
• juggler/trunk/macros/vrj.m4 (modified) (1 diff)

juggler/trunk/macros/gadget.m4

@@ -51 +51 @@
-    if test "x$gadget_meta_file" != "x" ; then
-        gadget_flagpoll_args="--from-file=$gadget_meta_file"
+    elif test -f "$instlinks/share/flagpoll/gadgeteer.fpc" ; then
+        gadget_flagpoll_args="--from-file=$instlinks/share/flagpoll/gadgeteer.fpc"
-    else
---from-file=$instlinks/share/flagpoll/gadgeteer.fpc
+
-    fi
-

juggler/trunk/macros/jccl.m4

@@ -40 +40 @@
-    if test "x$jccl_meta_file" != "x" ; then
-        jccl_flagpoll_args="--from-file=$jccl_meta_file"
+    elif test -f "$instlinks/share/flagpoll/jccl.fpc" ; then
+        jccl_flagpoll_args="--from-file=$instlinks/share/flagpoll/jccl.fpc"
-    else
---from-file=$instlinks/share/flagpoll/jccl.fpc
+
-    fi
-

juggler/trunk/macros/sonix.m4

@@ -60 +60 @@
-    if test "x$sonix_meta_file" != "x" ; then
-        sonix_flagpoll_args="--from-file=$sonix_meta_file"
+    elif test -f "$instlinks/share/flagpoll/sonix.fpc" ; then
+        sonix_flagpoll_args="--from-file=$instlinks/share/flagpoll/sonix.fpc"
-    else
---from-file=$instlinks/share/flagpoll/sonix.fpc
+
-    fi
-

juggler/trunk/macros/tweek.m4

@@ -40 +40 @@
-    if test "x$tweek_meta_file" != "x" ; then
-        tweek_flagpoll_args="--from-file=$tweek_meta_file"
+    elif test -f "$instlinks/share/flagpoll/tweek.fpc" ; then
+        tweek_flagpoll_args="--from-file=$instlinks/share/flagpoll/tweek.fpc"
-    else
---from-file=$instlinks/share/flagpoll/tweek.fpc
+
-    fi
-

juggler/trunk/macros/vpr.m4

@@ -53 +53 @@
-    if test "x$vpr_meta_file" != "x" ; then
-        vpr_flagpoll_args="--from-file=$vpr_meta_file"
+    elif test -f "$instlinks/share/flagpoll/vpr.fpc" ; then
+        vpr_flagpoll_args="--from-file=$instlinks/share/flagpoll/vpr.fpc"
-    else
---from-file=$instlinks/share/flagpoll/vpr.fpc
+
-    fi
-

juggler/trunk/macros/vrj.m4

@@ -50 +50 @@
-    if test "x$vrj_meta_file" != "x" ; then
-        vrj_flagpoll_args="--from-file=$vrj_meta_file"
+    elif test -f "$instlinks/share/flagpoll/vrjuggler.fpc" ; then
+        vrj_flagpoll_args="--from-file=$instlinks/share/flagpoll/vrjuggler.fpc"
-    else
---from-file=$instlinks/share/flagpoll/vrjuggler.fpc
+
-    fi
-