Fix META file and goaljobs script to work with installed package.

diff --git a/META.in b/META.in
index ff06cf9..7b93c43 100644 (file)
--- a/META.in
+++ b/META.in
@@ -1,14 +1,11 @@
-name="goaljobs"
-version="@PACKAGE_VERSION@"
-description="make & cron replacement and business rules manager"
-requires="unix,calendar"
-archive(byte)="goaljobs.cma"
-archive(native)="goaljobs.cmxa"
+# http://projects.camlcity.org/projects/dl/findlib-1.3.3/doc/guide-html/x412.html
+name = "goaljobs"
+version = "@PACKAGE_VERSION@"
+description = "make & cron replacement and business rules manager"
 
-package "syntax" (
-        version="@PACKAGE_VERSION@"
-        requires="camlp4"
-        description="goaljobs syntax extension"
-        archive(syntax,preprocessor) = "-parser o -parser op -printer p unix.cma goaljobs.cma pa_goal.cmo"
-        archive(syntax,toploop) = "unix.cma goaljobs.cma pa_goal.cmo"
-)
+requires = "camlp4,unix,calendar"
+
+archive(syntax,toploop) = "pa_goal.cmo goaljobs.cma"
+archive(syntax,preprocessor) = "-parser o -parser op -printer p pa_goal.cmo"
+archive(syntax,byte) = "goaljobs.cma"
+archive(syntax,native) = "goaljobs.cmxa"

diff --git a/goaljobs b/goaljobs
index 89e15e3..756d527 100755 (executable)
--- a/goaljobs
+++ b/goaljobs
@@ -122,7 +122,9 @@ echo "Goaljobs.init ()" >> $main
 declare -a pkg
 if [ "$pkgdir" = "" ]; then
     pkg[0]="-package"
-    pkg[1]="goaljobs,goaljobs.syntax"
+    pkg[1]="goaljobs"
+    pkg[2]="-syntax"
+    pkg[3]="goaljobs"
 else
     # Get the dependencies manually.  Note that calendar requires
     # unix & str.