From: Andrew McNab <andrew.mcnab@manchester.ac.uk>
Date: Thu, 8 Dec 2005 16:25:02 +0000 (+0000)
Subject: Build updates for gridsite-copy.cgi
X-Git-Tag: after_merge_from_branch_1_1_0_RC15~10
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=55aad60c1e0f5a71df340f0b76be34deb540a103;p=jra1mw.git

Build updates for gridsite-copy.cgi
---

diff --git a/org.gridsite.core/CHANGES b/org.gridsite.core/CHANGES
index dc4e1dd..7f23950 100644
--- a/org.gridsite.core/CHANGES
+++ b/org.gridsite.core/CHANGES
@@ -1,6 +1,7 @@
 * Mon Dec 5 2005 Andrew McNab <Andrew.McNab@man.ac.uk>
 - Change GRIDHTTP_ONETIME to GRIDHTTP_PASSCODE 
 - Remove onetime=yes default from mod_gridsite
+- Update gridsite.spec and Makefile for gridsite-copy.cgi
 * Wed Nov 16 2005 Andrew McNab <Andrew.McNab@man.ac.uk>
 - ==== GridSite version 1.1.16 ====
 * Wed Nov 16 2005 Andrew McNab <Andrew.McNab@man.ac.uk>
diff --git a/org.gridsite.core/src/Makefile b/org.gridsite.core/src/Makefile
index 8e9f25c..fd89c2f 100644
--- a/org.gridsite.core/src/Makefile
+++ b/org.gridsite.core/src/Makefile
@@ -59,7 +59,7 @@ endif
 build: apidoc \
        libgridsite.so.$(VERSION) libgridsite.a htcp mod_gridsite.so \
        urlencode findproxyfile real-gridsite-admin.cgi gsexec \
-       # gridsite-delegation.cgi # htproxyput 
+       gridsite-copy.cgi # gridsite-delegation.cgi # htproxyput 
 
 build: libgridsite_globus.so.$(VERSION) libgridsite_globus.a
 
@@ -166,6 +166,12 @@ htcp: htcp.c libgridsite.a
 	    -I/usr/kerberos/include \
             `curl-config --cflags` `curl-config --libs` -lgridsite
 
+gridsite-copy.cgi: gridsite-copy.c libgridsite.a
+	gcc -g -DVERSION=\"$(PATCH_VERSION)\" $(MYCFLAGS) \
+	    -o gridsite-copy.cgi gridsite-copy.c -L. \
+	    -I/usr/kerberos/include \
+            `curl-config --cflags` `curl-config --libs` -lgridsite
+
 mod_gridsite.so: mod_gridsite.c mod_ssl-private.h libgridsite.a
 	gcc -g $(MYCFLAGS) -shared -Wl,-soname=gridsite_module \
            -I/usr/kerberos/include \
@@ -279,6 +285,7 @@ install: apidoc
 	cp -f urlencode $(prefix)/bin
 	cp -f findproxyfile $(prefix)/bin
 	cp -f real-gridsite-admin.cgi $(prefix)/sbin
+	cp -f gridsite-copy.cgi $(prefix)/sbin
 	cp -f  libgridsite.a $(prefix)/lib
 	cp -f  libgridsite.so.$(PATCH_VERSION) $(prefix)/lib
 	ln -sf libgridsite.so.$(PATCH_VERSION) \
@@ -328,7 +335,7 @@ dist:
 	cp -f Makefile grst*.c htproxyput.c proxyput-example.c htcp.c \
                  urlencode.c findproxyfile.c gaclexample.c mod_gridsite.c \
                  delegation.h grst_admin.h mod_ssl-private.h \
-                 gsexec.c gsexec.h \
+                 gsexec.c gsexec.h gridsite-copy.c \
                  roffit gridsite.spec \
                  Doxyfile doxygen.css doxyheader.html \
                  ../gridsite-$(PATCH_VERSION)/src
diff --git a/org.gridsite.core/src/gridsite.spec b/org.gridsite.core/src/gridsite.spec
index 7780f22..226dae3 100644
--- a/org.gridsite.core/src/gridsite.spec
+++ b/org.gridsite.core/src/gridsite.spec
@@ -83,6 +83,7 @@ rm -f %(echo ${MYPREFIX:-/usr})/share/doc/gridsite
 %attr(-, root, root) %(echo ${MYPREFIX:-/usr})/lib/libgridsite_globus.a
 %attr(-, root, root) %(echo ${MYPREFIX:-/usr})/lib/httpd/modules/mod_gridsite.so
 %attr(-, root, root) %(echo ${MYPREFIX:-/usr})/sbin/real-gridsite-admin.cgi
+%attr(-, root, root) %(echo ${MYPREFIX:-/usr})/sbin/gridsite-copy.cgi
 
 %files -n htcp
 %attr(-, root, root) %(echo ${MYPREFIX:-/usr})/bin/htcp