From: Elisabetta Ronchieri <elisabetta.ronchieri@cnaf.infn.it>
Date: Mon, 31 May 2004 15:46:02 +0000 (+0000)
Subject: Merged with code in the infnforge repository
X-Git-Tag: import_scm_1~20
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=920e2432bd9e015cff1734718ef91e6fed569ee8;p=jra1mw.git

Merged with code in the infnforge repository
---

diff --git a/org.glite.wms-utils.jobid/src/Makefile.am b/org.glite.wms-utils.jobid/src/Makefile.am
index 9eeff28..cac14fb 100755
--- a/org.glite.wms-utils.jobid/src/Makefile.am
+++ b/org.glite.wms-utils.jobid/src/Makefile.am
@@ -9,7 +9,7 @@
 ## Subdirectories list
 SUBDIRS = jobid
 
-jobid_includedir = $(includedir)/glite/workload/jobid
-jobid_include_HEADERS = jobid_namespace.h
+#jobid_includedir = $(includedir)/glite/workload/jobid
+#jobid_include_HEADERS = jobid_namespace.h
 
 MAINTAINERCLEANFILES = Makefile.in 
diff --git a/org.glite.wms-utils.jobid/src/jobid/JobId.h b/org.glite.wms-utils.jobid/src/jobid/JobId.h
index 036d2ec..1dca8d4 100755
--- a/org.glite.wms-utils.jobid/src/jobid/JobId.h
+++ b/org.glite.wms-utils.jobid/src/jobid/JobId.h
@@ -10,7 +10,7 @@
 #include <string>
 #include <iosfwd>
 
-#include "../jobid_namespace.h"
+#include "jobid_namespace.h"
 #include "jobid.h"
 
 typedef struct _edg_wlc_jobid_s* edg_wlc_jobid_t;
diff --git a/org.glite.wms-utils.jobid/src/jobid/Makefile.am b/org.glite.wms-utils.jobid/src/jobid/Makefile.am
index 55f855d..8ab7551 100755
--- a/org.glite.wms-utils.jobid/src/jobid/Makefile.am
+++ b/org.glite.wms-utils.jobid/src/jobid/Makefile.am
@@ -21,7 +21,8 @@ jobidinclude_HEADERS = \
 	JobIdExceptions.h \
 	jobid.h \
 	manipulation.h \
-	strmd5.h
+	strmd5.h \
+	jobid_namespace.h
 
 AM_CPPFLAGS = -I$(top_srcdir)/.. \
 	$(GLITE_WORKLOAD_CFLAGS) \