]>
Commit | Line | Data |
---|---|---|
39ba387d | 1 | diff -Nur desire-3.1/depend/cistat/Makefile.in desire-3.1.new/depend/cistat/Makefile.in |
2 | --- desire-3.1/depend/cistat/Makefile.in Mon Apr 9 10:35:54 2001 | |
3 | +++ desire-3.1.new/depend/cistat/Makefile.in Mon May 21 14:45:30 2001 | |
4 | @@ -6,6 +6,7 @@ | |
5 | libdir=@libdir@ | |
6 | includedir=@includedir@ | |
7 | sysconfdir=@sysconfdir@ | |
8 | +weblocation=/home/httpd/cgi-bin/cistat | |
9 | ||
10 | LIBS+= -L../../libdesire/.libs | |
11 | LIBS+= -L../../libddraw/.libs | |
12 | @@ -46,13 +47,11 @@ | |
13 | rm -f *.o *.core ${TARGETS} 1 | |
14 | ||
15 | install: all | |
16 | - ${INSTALL} -m 555 cistat ${bindir} | |
17 | - ${INSTALL} -m 555 cidraw.cgi /www/admin/traffic | |
18 | - ${INSTALL} -m 555 ./html/index.html ./html/form.cgi /www/admin/traffic | |
19 | - @echo | |
20 | - @echo Now you might want to make install-conf from ./depend/cistat | |
21 | - @echo | |
22 | - | |
23 | -install-conf: | |
24 | - ${INSTALL} -m 444 -g 0 -o 0 cistat.conf ${sysconfdir} | |
25 | + install -d $(DESTDIR)${bindir} | |
26 | + install -d $(DESTDIR)${weblocation} | |
27 | + install -d $(DESTDIR)${sysconfdir} | |
28 | + ${INSTALL} -m 555 cistat $(DESTDIR)${bindir} | |
29 | + ${INSTALL} -m 555 cidraw.cgi $(DESTDIR)${weblocation} | |
30 | + ${INSTALL} -m 555 ./html/* ./html/form.cgi $(DESTDIR)${weblocation} | |
31 | + ${INSTALL} -m 444 cistat.conf $(DESTDIR)${sysconfdir} | |
32 | ||
33 | diff -Nur desire-3.1/depend/ctbdump/Makefile.in desire-3.1.new/depend/ctbdump/Makefile.in | |
34 | --- desire-3.1/depend/ctbdump/Makefile.in Mon Apr 9 10:35:54 2001 | |
35 | +++ desire-3.1.new/depend/ctbdump/Makefile.in Mon May 21 14:43:36 2001 | |
36 | @@ -21,7 +21,8 @@ | |
37 | ${CC} ${CFLAGS} -o ctbdump ctbdump.c ${LIBS} | |
38 | ||
39 | install: all | |
40 | - ${INSTALL} -m 555 -g 0 -o 0 ctbdump ${bindir} | |
41 | + install -d $(DESTDIR)${bindir} | |
42 | + ${INSTALL} -m 555 ctbdump $(DESTDIR)${bindir} | |
43 | ||
44 | clean: | |
45 | rm -f *.o *.core ctbdump 1 | |
46 | diff -Nur desire-3.1/depend/ctbmap/Makefile.in desire-3.1.new/depend/ctbmap/Makefile.in | |
47 | --- desire-3.1/depend/ctbmap/Makefile.in Mon Apr 9 10:35:55 2001 | |
48 | +++ desire-3.1.new/depend/ctbmap/Makefile.in Mon May 21 14:43:36 2001 | |
49 | @@ -21,7 +21,8 @@ | |
50 | ${CC} ${CFLAGS} -o ctbmap ctbmap.c ${LIBS} | |
51 | ||
52 | install: all | |
53 | - ${INSTALL} -m 555 -g 0 -o 0 ctbmap ${bindir} | |
54 | + install -d $(DESTDIR)${bindir} | |
55 | + ${INSTALL} -m 555 ctbmap $(DESTDIR)${bindir} | |
56 | ||
57 | clean: | |
58 | rm -f *.o *.core ctbmap 1 | |
59 | diff -Nur desire-3.1/depend/proxy_stats/Makefile.in desire-3.1.new/depend/proxy_stats/Makefile.in | |
60 | --- desire-3.1/depend/proxy_stats/Makefile.in Mon Apr 9 10:35:55 2001 | |
61 | +++ desire-3.1.new/depend/proxy_stats/Makefile.in Mon May 21 14:44:39 2001 | |
62 | @@ -6,7 +6,7 @@ | |
63 | includedir=@includedir@ | |
64 | sysconfdir=@sysconfdir@ | |
65 | ||
66 | -WEBLOCATION=/www/admin/proxy | |
67 | +WEBLOCATION=/home/httpd/cgi-bin/proxy_stats | |
68 | ||
69 | CC=@CC@ | |
70 | ||
71 | @@ -45,16 +45,12 @@ | |
72 | ${CC} ${CFLAGS} -o $@ -c $< | |
73 | ||
74 | install: all | |
75 | - ${INSTALL} -m 555 proxy_getstat ${bindir} | |
76 | - @if [ ! -d ${WEBLOCATION} ]; then \ | |
77 | - echo; \ | |
78 | - echo "ERROR: proxy_draw cannot be installed due to directory absence: ${WEBLOCATION}"; \ | |
79 | - echo; \ | |
80 | - else \ | |
81 | - ${INSTALL} -m 555 -g 0 -o 0 proxy_draw.cgi ${WEBLOCATION}; \ | |
82 | - ${INSTALL} -m 555 -g 0 -o 0 proxy_top.cgi ${WEBLOCATION}; \ | |
83 | - ${INSTALL} -m 555 -g 0 -o 0 ./html/form.cgi ${WEBLOCATION}; \ | |
84 | - fi | |
85 | + install -d $(DESTDIR)${bindir} | |
86 | + ${INSTALL} -m 555 proxy_getstat $(DESTDIR)${bindir} | |
87 | + install -d $(DESTDIR)${WEBLOCATION} | |
88 | + ${INSTALL} -m 555 proxy_draw.cgi $(DESTDIR)${WEBLOCATION} | |
89 | + ${INSTALL} -m 555 proxy_top.cgi $(DESTDIR)${WEBLOCATION} | |
90 | + ${INSTALL} -m 555 ./html/* $(DESTDIR)${WEBLOCATION} | |
91 | ||
92 | clean: | |
93 | rm -f *.o *.core ${TARGETS} 1 | |
94 | diff -Nur desire-3.1/libddraw/Makefile.in desire-3.1.new/libddraw/Makefile.in | |
95 | --- desire-3.1/libddraw/Makefile.in Mon Apr 9 10:35:54 2001 | |
96 | +++ desire-3.1.new/libddraw/Makefile.in Mon May 21 14:43:36 2001 | |
97 | @@ -42,11 +42,12 @@ | |
98 | $(LIBTOOL) ${CC} ${CFLAGS} -c $< | |
99 | ||
100 | install: all | |
101 | - $(LIBTOOL) ${INSTALL} -m 444 ./.libs/lib${LIB}.a ${libdir} | |
102 | - rm -f ${libdir}/${SHLIB_NAME} ${libdir}/${SHLIB_LINK} | |
103 | - $(LIBTOOL) ${INSTALL} -m 444 ./.libs/${SHLIB_NAME} ${libdir} | |
104 | - ${LN_SF} ${SHLIB_NAME} ${libdir}/${SHLIB_LINK} | |
105 | - ${INSTALL} -m 444 -o 0 -g 0 ../include/ddraw.h ${includedir} | |
106 | + install -d $(DESTDIR)${libdir} | |
107 | + install -d $(DESTDIR)${includedir} | |
108 | + $(LIBTOOL) ${INSTALL} -m 444 ./.libs/lib${LIB}.a $(DESTDIR)${libdir} | |
109 | + $(LIBTOOL) ${INSTALL} -m 444 ./.libs/${SHLIB_NAME} $(DESTDIR)${libdir} | |
110 | + ${LN_SF} ${SHLIB_NAME} $(DESTDIR)${libdir}/${SHLIB_LINK} | |
111 | + ${INSTALL} -m 444 ../include/ddraw.h $(DESTDIR)${includedir} | |
112 | ||
113 | clean: | |
114 | rm -f *.o *.a *.lo *.la ${SHLIB_NAME} ${SHLIB_LINK} *.core | |
115 | diff -Nur desire-3.1/libdesire/Makefile.in desire-3.1.new/libdesire/Makefile.in | |
116 | --- desire-3.1/libdesire/Makefile.in Mon Apr 9 10:35:53 2001 | |
117 | +++ desire-3.1.new/libdesire/Makefile.in Mon May 21 14:43:36 2001 | |
118 | @@ -54,11 +54,12 @@ | |
119 | ||
120 | ||
121 | install: all | |
122 | - $(LIBTOOL) ${INSTALL} -m 444 ./.libs/lib${LIB}.a ${libdir} | |
123 | - rm -f ${libdir}/${SHLIB_NAME} ${libdir}/${SHLIB_LINK} | |
124 | - $(LIBTOOL) ${INSTALL} -m 444 ./.libs/${SHLIB_NAME} ${libdir} | |
125 | - ${LN_SF} ${SHLIB_NAME} ${libdir}/${SHLIB_LINK} | |
126 | - ${INSTALL} -m 444 ../include/desire.h ${includedir} | |
127 | + install -d $(DESTDIR)/${libdir} | |
128 | + install -d $(DESTDIR)/${includedir} | |
129 | + $(LIBTOOL) ${INSTALL} -m 444 ./.libs/lib${LIB}.a $(DESTDIR)${libdir} | |
130 | + $(LIBTOOL) ${INSTALL} -m 444 ./.libs/${SHLIB_NAME} $(DESTDIR)${libdir} | |
131 | + ${LN_SF} ${SHLIB_NAME} $(DESTDIR)${libdir}/${SHLIB_LINK} | |
132 | + ${INSTALL} -m 444 ../include/desire.h $(DESTDIR)${includedir} | |
133 | ||
134 | clean: | |
135 | rm -f *.o *.lo *.la *.a ${SHLIB_NAME} ${SHLIB_LINK} *.core |