diff options
Diffstat (limited to 'www/zerowait-httpd/files/patch-Makefile')
-rw-r--r-- | www/zerowait-httpd/files/patch-Makefile | 57 |
1 files changed, 29 insertions, 28 deletions
diff --git a/www/zerowait-httpd/files/patch-Makefile b/www/zerowait-httpd/files/patch-Makefile index b0b5686b3ae8..2c8229702454 100644 --- a/www/zerowait-httpd/files/patch-Makefile +++ b/www/zerowait-httpd/files/patch-Makefile @@ -1,30 +1,31 @@ ---- Makefile.orig Wed Oct 6 21:21:53 2004 -+++ Makefile Sun Mar 20 17:31:49 2005 -@@ -2,6 +2,6 @@ +--- Makefile.orig Sun Apr 17 05:07:11 2005 ++++ Makefile Wed Jun 22 14:16:31 2005 +@@ -10,13 +10,15 @@ + rm -f *~ src/*~ --ROOT=/var/0W --PRIV=nobody:nobody -+ROOT=/var/0W -+PRIV=www:www - - SUBDIRS=common httpd - -@@ -14,7 +14,14 @@ - - install: - set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i install; done -- test -d $(ROOT) || (mkdir $(ROOT) && cp -R ../bin ../conf ../data ../logs $(ROOT)) -- test ../bin/0W-httpd -ef $(ROOT)/bin/0W-httpd || cp ../bin/0W-httpd $(ROOT)/bin/0W-httpd -- chown -R $(PRIV) $(ROOT)/bin/0W-httpd $(ROOT)/logs $(ROOT)/data -- chmod +s $(ROOT)/bin/0W-httpd + install: compile +- install -d $(ROOT)/bin $(ROOT)/conf $(ROOT)/docs +- install -d -o $(OWNER) -g $(GROUP) $(ROOT)/logs $(ROOT)/data/pids $(ROOT)/data/httpd +- test -f $(ROOT)/conf/httpd.conf || install -m 644 conf/httpd.conf $(ROOT)/conf +- install -b -m 644 conf/countries* $(ROOT)/conf +- install -b -m 644 docs/* $(ROOT)/docs +- install -b bin/update-countries.sh src/httpd/convert-ranges src/httpd/convert-geoip $(ROOT)/bin +- install -b -m 6755 -o $(OWNER) -g $(GROUP) src/httpd/0W-httpd $(ROOT)/bin + test -d $(ROOT)/0W-httpd || (mkdir $(ROOT)/0W-httpd) -+ cp -R ../data ../logs $(ROOT)/0W-httpd -+ test ../bin/0W-httpd -ef $(ROOT)/sbin/0W-httpd || cp ../bin/0W-httpd $(ROOT)/sbin/0W-httpd -+ test -d $(ROOT)/etc/0W-httpd || (mkdir $(ROOT)/etc/0W-httpd && cd ../conf/ && \ -+ cp countries $(ROOT)/etc/0W-httpd/countries.sample && \ -+ cp crontab $(ROOT)/etc/0W-httpd/crontab.sample && \ -+ cp httpd.conf $(ROOT)/etc/0W-httpd/httpd.conf.sample && \ -+ cp httpd.txt $(ROOT)/etc/0W-httpd/httpd.txt.sample && \ -+ cp ip2country $(ROOT)/etc/0W-httpd/ip2country.sample ) -+ chown -R $(PRIV) $(ROOT)/sbin/0W-httpd $(ROOT)/0W-httpd/logs $(ROOT)/0W-httpd/data -+ chmod +s $(ROOT)/sbin/0W-httpd ++ install -d $(ROOT)/0W-httpd/data $(ROOT)/0W-httpd/logs $(ROOT)/0W-httpd/pids ++ install -m 0755 bin/update-countries.sh src/httpd/convert-ranges src/httpd/convert-geoip $(ROOT)/bin ++ install -m 6755 -o $(OWNER) -g $(GROUP) src/httpd/0W-httpd $(ROOT)/sbin ++ test -d $(ROOT)/etc/0W-httpd || (mkdir $(ROOT)/etc/0W-httpd && cd conf/ && \ ++ cp countries* $(ROOT)/etc/0W-httpd/ && \ ++ cp httpd.conf $(ROOT)/etc/0W-httpd/httpd.conf.sample ) ++ chown -R $(OWNER):$(GROUP) $(ROOT)/sbin/0W-httpd $(ROOT)/0W-httpd/logs $(ROOT)/0W-httpd/data $(ROOT)/0W-httpd/pids ++ + @echo + @echo "Installed, run as root: $(ROOT)/bin/0W-httpd [-h]" + +@@ -33,3 +35,5 @@ + @read answer + killall 0W-httpd || true + rm -rf $(ROOT) ++ ++all: compile |