← Back to branch summary

~ubuntu-branches/ubuntu/trusty/apache2/trusty

« back to all changes in this revision

Viewing changes to debian/rules

  • Committer: Bazaar Package Importer
  • Author(s): Adam Conrad
  • Date: 2005-04-01 16:30:56 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20050401163056-ve71h4qd7f4plu7j
Tags: 2.0.53-5ubuntu5
Fix the init script to not exit with an error when asked to
stop a daemon that isn't running (Was the root cause of #8374)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/rules
25
25
 
26
26
AP2_COMMON_CONFARGS = --enable-layout=Debian --enable-so \
27
27
                      --with-program-name=apache2 --with-dbm=db42 \
 
28
                      --with-external-pcre=/usr \
28
29
                      --enable-logio --enable-userdir=shared \
29
30
                      --enable-ssl=shared --enable-deflate=shared \
30
31
                      --with-ldap=yes --with-ldap-include=/usr/include \
54
55
                --enable-file-cache=shared --enable-cache=shared \
55
56
                --enable-disk-cache=shared --enable-mem-cache=shared 
56
57
 
57
 
AP2_CONFLAGS = $(CFLAGS) -pipe -I/usr/include/xmltok -I/usr/include/openssl 
 
58
AP2_CONFLAGS = $(CFLAGS) -pipe -I/usr/include/xmltok -I/usr/include/openssl -Wall
58
59
#AP2_CONFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 
59
60
AP2_LDFLAGS = -ldl -lexpat -lcrypt -ldb-4.2
60
61
 
75
76
REALCURDIR=$(CURDIR)
76
77
FIRSTMPM=worker
77
78
PREFORKMPM=prefork
78
 
OTHERMPMS=perchild threadpool
79
 
THREADEDMPMS=worker perchild threadpool
 
79
OTHERMPMS=perchild
 
80
THREADEDMPMS=worker perchild
80
81
 
81
82
source.make: $(STAMP_DIR)/source.make
82
83
$(STAMP_DIR)/source.make:
86
87
 
87
88
configure: $(STAMP_DIR)/configure
88
89
$(STAMP_DIR)/configure: $(STAMP_DIR)/source.make 
 
90
        for i in config.guess config.sub ltmain.sh; do \
 
91
                for j in $$(find $(B)/ -name $$i); do \
 
92
                        cp /usr/share/libtool/$$i $$j; \
 
93
                done; \
 
94
        done
89
95
        cd $(B) && ./buildconf
90
96
        touch $@ 
91
97
 
94
100
        dh_testdir
95
101
        for i in $(FIRSTMPM); do \
96
102
                mkdir -p $(BUILD)/$$i ;\
97
 
                cd $(BUILD)/$$i && ac_cv_func_pthread_mutexattr_setpshared=no ac_cv_func_sem_open=no CFLAGS="$(AP2_CONFLAGS)" LDFLAGS="$(AP2_LDFLAGS)" $(REALCURDIR)/$(B)/configure --srcdir=$(REALCURDIR)/$(B) $(AP2_COMMON_CONFARGS) $(AP2_CONFARGS) --with-mpm=$$i ;\
 
103
                cd $(BUILD)/$$i && ac_cv_prog_AWK=mawk CFLAGS="$(AP2_CONFLAGS)" LDFLAGS="$(AP2_LDFLAGS)" $(REALCURDIR)/$(B)/configure --srcdir=$(REALCURDIR)/$(B) $(AP2_COMMON_CONFARGS) $(AP2_CONFARGS) --with-mpm=$$i ;\
98
104
                $(MAKE); \
99
105
                cd $(REALCURDIR);\
100
106
        done
101
107
        for i in $(OTHERMPMS) $(PREFORKMPM); do \
102
108
                mkdir -p $(BUILD)/$$i ;\
103
 
                cd $(BUILD)/$$i && ac_cv_func_pthread_mutexattr_setpshared=no ac_cv_func_sem_open=no CFLAGS="$(AP2_CONFLAGS)" LDFLAGS="$(AP2_LDFLAGS)" $(REALCURDIR)/$(B)/configure --srcdir=$(REALCURDIR)/$(B) $(AP2_COMMON_CONFARGS) --with-mpm=$$i ;\
 
109
                cd $(BUILD)/$$i && ac_cv_prog_AWK=mawk CFLAGS="$(AP2_CONFLAGS)" LDFLAGS="$(AP2_LDFLAGS)" $(REALCURDIR)/$(B)/configure --srcdir=$(REALCURDIR)/$(B) $(AP2_COMMON_CONFARGS) --with-mpm=$$i ;\
104
110
                $(MAKE); \
105
111
                cd $(REALCURDIR);\
106
112
        done
116
122
        for i in $(FIRSTMPM) $(OTHERMPMS); do \
117
123
                rm -f debian/apache2-mpm-$$i.postinst ;\
118
124
                rm -f debian/apache2-mpm-$$i.prerm ;\
 
125
                rm -f debian/apache2-mpm-$$i.preinst ;\
119
126
                rm -f debian/apache2-mpm-$$i.init.d ;\
120
 
        done
 
127
        done
 
128
        rm -f debian/apache2-mpm-prefork.prerm
121
129
        rm -f debian/apache2-mpm-prefork.init.d
122
130
        rm -f debian/apache2-common.init.d
123
131
        dh_clean
164
172
                mv debian/apache2-mpm-$$i/usr/share/man/man8/apxs.8 debian/apache2-$$TARGET-dev/usr/share/man/man8/apxs2.8 ;\
165
173
                cp build-tree/apache2/build/special.mk debian/apache2-$$TARGET-dev/usr/share/apache2/build/special.mk ;\
166
174
                mv debian/apache2-mpm-$$i/usr/share/apache2/build/* debian/apache2-$$TARGET-dev/usr/share/apache2/build/ ;\
 
175
                sed -e "s,`pwd`/build-tree/apache2-build/$$i/srclib/apr/libapr-0.la,/usr/lib/libapr-0.la," \
 
176
                    -e "s,`pwd`/build-tree/apache2-build/$$i/srclib/apr-util/libaprutil-0.la,/usr/lib/libaprutil-0.la," \
 
177
                    -e "s,`pwd`/build-tree/apache2-build/$$i/srclib/pcre/libpcre.la,," \
 
178
                    -e "s,^EXTRA_INCLUDES =.*$$,EXTRA_INCLUDES = -I/usr/include/openssl -I/usr/include/apache2 -I/usr/include/apr-0," \
 
179
                    -e "s,^abs_srcdir =.*$$,abs_srcdir =," \
 
180
                    -e "s,^LIBTOOL =.*$$,LIBTOOL = /bin/sh /usr/bin/libtool --silent," \
 
181
                    -e "s,^SH_LIBTOOL =.*$$,SH_LIBTOOL = /bin/sh /usr/bin/libtool --silent," \
 
182
                    -e "s,APR_INCLUDEDIR =.*$$,APR_INCLUDEDIR = /usr/include/apr-0," \
 
183
                    -e "s,APU_INCLUDEDIR =.*$$,APU_INCLUDEDIR = /usr/include/apr-0," \
 
184
                    build-tree/apache2-build/$$i/build/config_vars.mk > debian/apache2-$$TARGET-dev/usr/share/apache2/build/config_vars.mk; \
167
185
        done
168
 
#should be a line up :/ cp debian/config_vars.mk debian/apache2-$$TARGET-dev/usr/share/apache2/build/config_vars.mk ;\
169
 
#standard stuff
 
186
 
 
187
#apache2-utils stuff
 
188
        mv debian/apache2-mpm-worker/usr/sbin/ab debian/apache2-utils/usr/sbin/ab
 
189
        mv debian/apache2-mpm-worker/usr/share/man/man8/ab.8 debian/apache2-utils/usr/share/man/man8/ab.8
 
190
        cp build-tree/apache2/support/check_forensic debian/apache2-utils/usr/sbin/check_forensic
 
191
        cp debian/check_forensic.8 debian/apache2-utils/usr/share/man/man8/check_forensic.8
 
192
        mv debian/apache2-mpm-worker/usr/sbin/checkgid debian/apache2-utils/usr/sbin/checkgid
 
193
        cp debian/checkgid.8 debian/apache2-utils/usr/share/man/man8/checkgid.8
 
194
        mv debian/apache2-mpm-worker/usr/sbin/dbmmanage debian/apache2-utils/usr/bin/dbmmanage
 
195
        mv debian/apache2-mpm-worker/usr/share/man/man1/dbmmanage.1 debian/apache2-utils/usr/share/man/man1/dbmmanage.1
 
196
        mv debian/apache2-mpm-worker/usr/sbin/htdbm debian/apache2-utils/usr/bin/htdbm
 
197
        mv debian/apache2-mpm-worker/usr/sbin/htdigest debian/apache2-utils/usr/bin/htdigest
 
198
        mv debian/apache2-mpm-worker/usr/share/man/man1/htdigest.1 debian/apache2-utils/usr/share/man/man1/htdigest.1
 
199
        mv debian/apache2-mpm-worker/usr/sbin/htpasswd debian/apache2-utils/usr/bin/htpasswd
 
200
        mv debian/apache2-mpm-worker/usr/share/man/man1/htpasswd.1 debian/apache2-utils/usr/share/man/man1/htpasswd.1
 
201
        mv debian/apache2-mpm-worker/usr/sbin/logresolve debian/apache2-utils/usr/sbin/logresolve
 
202
        mv debian/apache2-mpm-worker/usr/share/man/man8/logresolve.8 debian/apache2-utils/usr/share/man/man8/logresolve.8
 
203
        cp build-tree/apache2-build/worker/support/split-logfile debian/apache2-utils/usr/sbin/split-logfile
 
204
        chmod 755 debian/apache2-utils/usr/sbin/split-logfile
 
205
        mv debian/apache2-mpm-worker/usr/sbin/rotatelogs debian/apache2-utils/usr/sbin/rotatelogs
 
206
        mv debian/apache2-mpm-worker/usr/share/man/man8/rotatelogs.8 debian/apache2-utils/usr/share/man/man8/rotatelogs.8
 
207
 
 
208
#apache2-utils backward compatibility symlinks
 
209
        ln -s ab debian/apache2-utils/usr/sbin/ab2
 
210
        ln -s checkgid debian/apache2-utils/usr/sbin/checkgid2
 
211
        ln -s dbmmanage debian/apache2-utils/usr/bin/dbmmanage2
 
212
        ln -s htdigest debian/apache2-utils/usr/bin/htdigest2
 
213
        ln -s htpasswd debian/apache2-utils/usr/bin/htpasswd2
 
214
        ln -s logresolve debian/apache2-utils/usr/sbin/logresolve2
 
215
        ln -s rotatelogs debian/apache2-utils/usr/sbin/rotatelogs2
 
216
 
 
217
#apache2-common stuff
170
218
        mv debian/apache2-mpm-worker/usr/share/apache2/icons/* debian/apache2-common/usr/share/apache2/icons/
171
219
        mv debian/apache2-mpm-worker/usr/share/apache2/error/* debian/apache2-common/usr/share/apache2/error/
172
220
        mv debian/apache2-mpm-worker/usr/sbin/apachectl debian/apache2-common/usr/sbin/apache2ctl
173
 
        mv debian/apache2-mpm-worker/usr/sbin/htdigest debian/apache2-common/usr/bin/htdigest2
174
 
        mv debian/apache2-mpm-worker/usr/sbin/htpasswd debian/apache2-common/usr/bin/htpasswd2
175
 
        mv debian/apache2-mpm-worker/usr/sbin/logresolve debian/apache2-common/usr/sbin/logresolve2
176
 
        mv debian/apache2-mpm-worker/usr/sbin/ab debian/apache2-common/usr/bin/ab2
177
221
        mv debian/apache2-mpm-worker/usr/sbin/suexec debian/apache2-common/usr/lib/apache2/suexec2
178
 
        mv debian/apache2-mpm-worker/usr/sbin/rotatelogs debian/apache2-common/usr/sbin/rotatelogs2
179
 
        mv debian/apache2-mpm-worker/usr/sbin/dbmmanage debian/apache2-common/usr/sbin/dbmmanage2
180
 
        mv debian/apache2-mpm-worker/usr/sbin/checkgid debian/apache2-common/usr/sbin/checkgid2
181
222
        mv debian/apache2-mpm-worker/etc/apache2/*.conf debian/apache2-common/usr/share/doc/apache2/examples
182
223
        mv debian/apache2-mpm-worker/usr/lib/apache2/modules debian/apache2-common/usr/lib/apache2/modules
183
 
        mv debian/apache2-mpm-worker/usr/share/man/man1/htdigest.1 debian/apache2-common/usr/share/man/man1/htdigest2.1
184
 
        mv debian/apache2-mpm-worker/usr/share/man/man1/htpasswd.1 debian/apache2-common/usr/share/man/man1/htpasswd2.1
185
 
        mv debian/apache2-mpm-worker/usr/share/man/man1/dbmmanage.1 debian/apache2-common/usr/share/man/man1/dbmmanage2.1       
186
 
        mv debian/apache2-mpm-worker/usr/share/man/man8/ab.8 debian/apache2-common/usr/share/man/man8/ab2.8
187
224
        cp debian/apache2.8 debian/apache2-common/usr/share/man/man8/apache2.8
188
225
        cp debian/apache2ctl.8 debian/apache2-common/usr/share/man/man8/apache2ctl.8
189
 
        mv debian/apache2-mpm-worker/usr/share/man/man8/logresolve.8 debian/apache2-common/usr/share/man/man8/logresolve2.8
190
 
        mv debian/apache2-mpm-worker/usr/share/man/man8/rotatelogs.8 debian/apache2-common/usr/share/man/man8/rotatelogs2.8
191
226
        mv debian/apache2-mpm-worker/usr/share/man/man8/suexec.8 debian/apache2-common/usr/share/man/man8/suexec2.8
192
 
        mv debian/apache2-mpm-worker/usr/sbin/htdbm debian/apache2-common/usr/sbin/
193
227
        mv debian/apache2-mpm-worker/usr/sbin/envvars* debian/apache2-common/usr/share/apache2/build/
 
228
        mv debian/apache2-common/usr/share/apache2/build/envvars debian/apache2-common/etc/apache2/
194
229
        mv debian/apache2-mpm-worker/usr/share/apache2/default-site/htdocs/ debian/apache2-common/var/www/apache2-default/
195
230
        rm -r debian/apache2-common/var/www/apache2-default/manual
196
231
        cp debian/robots.txt debian/apache2-common/var/www/apache2-default/