summaryrefslogtreecommitdiff
path: root/www/zerowait-httpd/files/patch-Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'www/zerowait-httpd/files/patch-Makefile')
-rw-r--r--www/zerowait-httpd/files/patch-Makefile23
1 files changed, 8 insertions, 15 deletions
diff --git a/www/zerowait-httpd/files/patch-Makefile b/www/zerowait-httpd/files/patch-Makefile
index 2c8229702454..e9eca3379414 100644
--- a/www/zerowait-httpd/files/patch-Makefile
+++ b/www/zerowait-httpd/files/patch-Makefile
@@ -1,14 +1,14 @@
---- Makefile.orig Sun Apr 17 05:07:11 2005
-+++ Makefile Wed Jun 22 14:16:31 2005
-@@ -10,13 +10,15 @@
+--- Makefile.orig Tue Dec 5 15:06:00 2006
++++ Makefile Tue Dec 5 15:07:24 2006
+@@ -13,13 +13,14 @@
rm -f *~ src/*~
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
+- test -f $(ROOT)/conf/httpd.conf || install -m 644 conf/httpd.conf* $(ROOT)/conf
+- install -b -m 644 conf/countries* conf/regions* $(ROOT)/conf
+- install -b -m 644 docs/crontab docs/httpd.ru.txt $(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)
@@ -16,16 +16,9 @@
+ 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 )
++ 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