Changeset 28484 for branches/pap/psconfig/psbuild

Timestamp:

Jun 24, 2010, 2:59:09 PM (16 years ago)

Author:

Paul Price

Message:

Merging trunk in advance of reintegrating into trunk.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• psconfig/psbuild (modified) (2 diffs)

branches/pap/psconfig/psbuild

@@ -81 +81 @@
         $developer = 1;
         $optimize = 1;
-        $magic = 1;
+        $magic = 1;
         shift; next;
     }
@@ -183 +183 @@
     # the operations system needs to first update the magic software
     if ($magic) {
-        $homedir = `pwd`; chomp $homedir;
-        chdir "../magic";
-
-        if (! -d magic || ! -d ssa-core-cpp || ! -d qt-everywhere-opensource-src-4.6.1) {
-            $status = vsystem ("make update");
-            if ($status) { die "failed to untar magic directories"; }
-        } else {
-            print "magic directories exist; run make update manually if needed\n";
-        }
-        chdir $homedir;
+        $homedir = `pwd`; chomp $homedir;
+        chdir "../magic";
+
+        if (! -d "magic" || ! -d "ssa-core-cpp") {
+            $status = vsystem ("make update");
+            if ($status) { die "failed to untar magic directories"; }
+        } else {
+            print "magic directories exist; run make update manually if needed\n";
+        }
+        chdir $homedir;
     }