1 |
steen |
1.1 |
--- lib/Makefile.orig 2004-01-22 00:56:26.000000000 -0800
|
2 |
|
|
+++ lib/Makefile 2004-01-22 02:48:06.000000000 -0800
|
3 |
|
|
@@ -34,9 +34,9 @@
|
4 |
|
|
|
5 |
|
|
include ../VERSION
|
6 |
|
|
|
7 |
|
|
-RPMCMD=$(shell if [ -x /usr/bin/rpmbuild ] ; then echo /usr/bin/rpmbuild; else echo rpm; fi)
|
8 |
|
|
+RPMCMD=$(which rpmbuild)
|
9 |
|
|
|
10 |
|
|
-all: libgridsite.a libgridsite.so.$(PATCH_VERSION) urlencode apidoc htcp
|
11 |
|
|
+all: libgridsite.a libgridsite.so.$(PATCH_VERSION)
|
12 |
|
|
|
13 |
|
|
libgridsite.so.$(VERSION): grst_x509.o grst_gacl.o grst_http.o
|
14 |
|
|
gcc -shared -Wl,-soname,libgridsite.so.$(MINOR_VERSION) \
|
15 |
|
|
@@ -46,50 +46,55 @@
|
16 |
|
|
ar src libgridsite.a grst_x509.o grst_gacl.o grst_http.o
|
17 |
|
|
|
18 |
|
|
grst_x509.o: grst_x509.c gridsite.h
|
19 |
|
|
- gcc $(MYCFLAGS) -I../lib -I/usr/include/openssl \
|
20 |
|
|
- -I/usr/kerberos/include -c grst_x509.c
|
21 |
|
|
+ gcc $(MYCFLAGS) -I../lib -I$(prefix)/include/openssl -I$(prefix)/include \
|
22 |
|
|
+ -I$(prefix)/kerberos/include -c grst_x509.c
|
23 |
|
|
|
24 |
|
|
grst_gacl.o: grst_gacl.c gridsite.h
|
25 |
|
|
- gcc $(MYCFLAGS) -I../lib -I/usr/include/openssl \
|
26 |
|
|
- -I/usr/kerberos/include `xml2-config --cflags` -c grst_gacl.c
|
27 |
|
|
+ gcc $(MYCFLAGS) -I../lib -I$(prefix)/include/openssl -I$(prefix)/include \
|
28 |
|
|
+ -I$(prefix)/kerberos/include `xml2-config --cflags` -c grst_gacl.c
|
29 |
|
|
|
30 |
|
|
grst_http.o: grst_http.c gridsite.h
|
31 |
|
|
- gcc $(MYCFLAGS) -I../lib -I/usr/include/openssl \
|
32 |
|
|
- -I/usr/kerberos/include -c grst_http.c
|
33 |
|
|
+ gcc $(MYCFLAGS) -I../lib -I$(prefix)/include/openssl -I$(prefix)/include \
|
34 |
|
|
+ -I$(prefix)/kerberos/include -c grst_http.c
|
35 |
|
|
|
36 |
|
|
urlencode: urlencode.c libgridsite.a
|
37 |
|
|
gcc -DVERSION=\"$(PATCH_VERSION)\" \
|
38 |
|
|
-o urlencode urlencode.c -L. -I../lib \
|
39 |
|
|
- -I/usr/include/openssl -I/usr/kerberos/include -lgridsite
|
40 |
|
|
+ -I$(prefix)/include/openssl -I$(prefix)/include -I$(prefix)/kerberos/include -lgridsite
|
41 |
|
|
|
42 |
|
|
htcp: htcp.c
|
43 |
|
|
gcc -DVERSION=\"$(PATCH_VERSION)\" -I. -o htcp htcp.c \
|
44 |
|
|
`curl-config --cflags` `curl-config --libs`
|
45 |
|
|
|
46 |
|
|
+install_all:
|
47 |
|
|
+ cp -f doxygen/index.html \
|
48 |
|
|
+ $(install_prefix)/share/doc/gridsite-$(PATCH_VERSION)/doxygen-index.html
|
49 |
|
|
+ cp -f doxygen/* $(install_prefix)/share/doc/gridsite-$(PATCH_VERSION)
|
50 |
|
|
+ cp -f htcp $(install_prefix)/bin
|
51 |
|
|
+ ln -sf htcp $(install_prefix)/bin/htls
|
52 |
|
|
+ ln -sf htcp $(install_prefix)/bin/htll
|
53 |
|
|
+ ln -sf htcp $(install_prefix)/bin/htrm
|
54 |
|
|
+ ln -sf htcp $(install_prefix)/bin/htmkdir
|
55 |
|
|
+
|
56 |
|
|
install:
|
57 |
|
|
- mkdir -p $(prefix)/include \
|
58 |
|
|
- $(prefix)/lib \
|
59 |
|
|
- $(prefix)/bin \
|
60 |
|
|
- $(prefix)/share/doc/gridsite-$(PATCH_VERSION)
|
61 |
|
|
- cp -f gridsite.h $(prefix)/include
|
62 |
|
|
- cp -f gridsite-gacl.h $(prefix)/include
|
63 |
|
|
- cp -f urlencode $(prefix)/bin
|
64 |
|
|
- cp -f libgridsite.a $(prefix)/lib
|
65 |
|
|
- cp -f libgridsite.so.$(PATCH_VERSION) $(prefix)/lib
|
66 |
|
|
+ mkdir -p $(install_prefix)/include \
|
67 |
|
|
+ $(install_prefix)/lib \
|
68 |
|
|
+ $(install_prefix)/bin \
|
69 |
|
|
+ $(install_prefix)/share/doc/gridsite-$(PATCH_VERSION)
|
70 |
|
|
+ cp -f gridsite.h $(install_prefix)/include
|
71 |
|
|
+ cp -f gridsite-gacl.h $(install_prefix)/include
|
72 |
|
|
+ cp -f urlencode $(install_prefix)/bin
|
73 |
|
|
+ cp -f libgridsite.a $(install_prefix)/lib
|
74 |
|
|
+ cp -f libgridsite.so.$(PATCH_VERSION) $(install_prefix)/lib
|
75 |
|
|
+ BDIR=`pwd`
|
76 |
|
|
+ cd $(install_prefix)/lib
|
77 |
|
|
ln -sf libgridsite.so.$(PATCH_VERSION) \
|
78 |
|
|
- $(prefix)/lib/libgridsite.so
|
79 |
|
|
+ libgridsite.so
|
80 |
|
|
ln -sf libgridsite.so.$(PATCH_VERSION) \
|
81 |
|
|
- $(prefix)/lib/libgridsite.so.$(MAJOR_VERSION)
|
82 |
|
|
+ libgridsite.so.$(MAJOR_VERSION)
|
83 |
|
|
ln -sf libgridsite.so.$(PATCH_VERSION) \
|
84 |
|
|
- $(prefix)/lib/libgridsite.so.$(MINOR_VERSION)
|
85 |
|
|
- cp -f doxygen/index.html \
|
86 |
|
|
- $(prefix)/share/doc/gridsite-$(PATCH_VERSION)/doxygen-index.html
|
87 |
|
|
- cp -f doxygen/* $(prefix)/share/doc/gridsite-$(PATCH_VERSION)
|
88 |
|
|
- cp -f htcp $(prefix)/bin
|
89 |
|
|
- ln -sf htcp $(prefix)/bin/htls
|
90 |
|
|
- ln -sf htcp $(prefix)/bin/htll
|
91 |
|
|
- ln -sf htcp $(prefix)/bin/htrm
|
92 |
|
|
- ln -sf htcp $(prefix)/bin/htmkdir
|
93 |
|
|
+ libgridsite.so.$(MINOR_VERSION)
|
94 |
|
|
+ cd $BDIR
|
95 |
|
|
|
96 |
|
|
dist:
|
97 |
|
|
mkdir -p ../gridsite-$(PATCH_VERSION)/lib
|
98 |
|
|
@@ -107,6 +112,6 @@
|
99 |
|
|
|
100 |
|
|
gaclexample: gaclexample.c libgridsite.a
|
101 |
|
|
gcc -o gaclexample gaclexample.c -I. -L. \
|
102 |
|
|
- -I/usr/include/openssl -I/usr/kerberos/include -lgridsite \
|
103 |
|
|
+ -I$(prefix)/include/openssl -I$(prefix)/include -I$(prefix)/kerberos/include -lgridsite \
|
104 |
|
|
-lxml2 -lz -lm
|
105 |
|
|
|
106 |
|
|
--- mod/Makefile.orig 2004-01-22 01:05:02.000000000 -0800
|
107 |
|
|
+++ mod/Makefile 2004-01-22 02:48:35.000000000 -0800
|
108 |
|
|
@@ -34,18 +34,19 @@
|
109 |
|
|
|
110 |
|
|
include ../VERSION
|
111 |
|
|
|
112 |
|
|
-RPMCMD=$(shell if [ -x /usr/bin/rpmbuild ] ; then echo /usr/bin/rpmbuild; else echo rpm; fi)
|
113 |
|
|
+RPMCMD=$(shell which rpmbuild )
|
114 |
|
|
|
115 |
|
|
mod_gridsite.so: mod_gridsite.c
|
116 |
|
|
gcc $(MYCFLAGS) -I../lib -shared -Wl,-soname=gridsite_module \
|
117 |
|
|
- -I/usr/include/openssl -I/usr/kerberos/include \
|
118 |
|
|
+ -I$(prefix)/include/openssl -I$(prefix)/kerberos/include \
|
119 |
|
|
+ -I$(prefix)/include/apache2 -I$(prefix)/include -L../lib\
|
120 |
|
|
-DVERSION=\"$(VERSION)\" -o mod_gridsite.so \
|
121 |
|
|
mod_gridsite.c $(MYLDFLAGS) -lxml2 -lm -lz -lgridsite
|
122 |
|
|
|
123 |
|
|
install:
|
124 |
|
|
- mkdir -p $(prefix)/lib/httpd/modules \
|
125 |
|
|
- $(prefix)/share/doc/gridsite-$(VERSION)
|
126 |
|
|
- cp -f mod_gridsite.so $(prefix)/lib/httpd/modules
|
127 |
|
|
+ mkdir -p $(install_prefix)/libexec/apache2 \
|
128 |
|
|
+ $(install_prefix)/share/doc/gridsite-$(VERSION)
|
129 |
|
|
+ cp -f mod_gridsite.so $(install_prefix)/libexec/apache2
|
130 |
|
|
|
131 |
|
|
dist:
|
132 |
|
|
mkdir -p ../gridsite-$(VERSION)/mod
|