summaryrefslogtreecommitdiff
path: root/thttpd/files/install.patch
blob: cdf92a982e7baef3c7b7abe3c3d72f8714203169 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87

#
# Patch managed by http://www.holgerschurig.de/patcher.html
#

--- thttpd-2.25b/Makefile.in~install.patch
+++ thttpd-2.25b/Makefile.in
@@ -27,6 +27,7 @@
 # Various configurable paths (remember to edit Makefile.in, not Makefile)
 
 # Top level hierarchy.
+DESTDIR = 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 # Pathname of directory to install the binary.
@@ -110,11 +111,11 @@
 
 installthis:
 	-mkdir -p $(DESTDIR)$(BINDIR)
-	$(INSTALL) -m 555 -o bin -g bin thttpd $(DESTDIR)$(BINDIR)
+	$(INSTALL) -m 755 thttpd $(DESTDIR)$(BINDIR)
 
 install-man:
 	-mkdir -p $(DESTDIR)$(MANDIR)/man8
-	$(INSTALL) -m 444 -o bin -g bin thttpd.8 $(DESTDIR)$(MANDIR)/man8
+	$(INSTALL) -m 644 thttpd.8 $(DESTDIR)$(MANDIR)/man8
 
 installsubdirs:
 	for i in $(SUBDIRS) ; do ( \
--- thttpd-2.25b/extras/Makefile.in~install.patch
+++ thttpd-2.25b/extras/Makefile.in
@@ -66,18 +66,16 @@
 
 
 install:	all
-	rm -f $(BINDIR)/makeweb $(BINDIR)/htpasswd $(BINDIR)/syslogtocern
-	cp makeweb $(BINDIR)/makeweb
-	chgrp $(WEBGROUP) $(BINDIR)/makeweb
-	chmod 2755 $(BINDIR)/makeweb
-	cp htpasswd $(BINDIR)/htpasswd
-	cp syslogtocern $(BINDIR)/syslogtocern
-	rm -f $(MANDIR)/man1/makeweb.1
-	cp makeweb.1 $(MANDIR)/man1/makeweb.1
-	rm -f $(MANDIR)/man1/htpasswd.1
-	cp htpasswd.1 $(MANDIR)/man1/htpasswd.1
-	rm -f $(MANDIR)/man8/syslogtocern.8
-	cp syslogtocern.8 $(MANDIR)/man8/syslogtocern.8
+	install -d $(DESTDIR)$(BINDIR)
+#	install -g $(WEBGROUP) -m 2755 makeweb $(DESTDIR)$(BINDIR)/makeweb
+	install -m 2755 makeweb $(DESTDIR)$(BINDIR)/makeweb
+	install -m 0755 htpasswd $(DESTDIR)$(BINDIR)/htpasswd
+	install -m 0755 syslogtocern $(DESTDIR)$(BINDIR)/syslogtocern
+	install -d $(DESTDIR)$(MANDIR)/man1 \
+		   $(DESTDIR)$(MANDIR)/man8
+	install -m 0644 makeweb.1 $(DESTDIR)$(MANDIR)/man1/makeweb.1
+	install -m 0644 htpasswd.1 $(DESTDIR)$(MANDIR)/man1/htpasswd.1
+	install -m 0644 syslogtocern.8 $(DESTDIR)$(MANDIR)/man8/syslogtocern.8
 
 clean:
 	rm -f $(CLEANFILES)
--- thttpd-2.25b/cgi-src/Makefile.in~install.patch
+++ thttpd-2.25b/cgi-src/Makefile.in
@@ -67,17 +67,13 @@
 	cd .. ; $(MAKE) $(MFLAGS) strerror.o
 
 install:	all
-	-mkdir -p $(CGIBINDIR)
-	rm -f $(CGIBINDIR)/redirect
-	cp redirect $(CGIBINDIR)/redirect
-	rm -f $(MANDIR)/man8/redirect.8
-	cp redirect.8 $(MANDIR)/man8/redirect.8
-	rm -f $(CGIBINDIR)/ssi
-	cp ssi $(CGIBINDIR)/ssi
-	rm -f $(MANDIR)/man8/ssi.8
-	cp ssi.8 $(MANDIR)/man8/ssi.8
-	rm -f $(CGIBINDIR)/phf
-	cp phf $(CGIBINDIR)/phf
+	install -d $(DESTDIR)$(CGIBINDIR)
+	install -m 0755 redirect $(DESTDIR)$(CGIBINDIR)/redirect
+	install -d $(DESTDIR)$(MANDIR)/man8
+	install -m 0644 redirect.8 $(DESTDIR)$(MANDIR)/man8/redirect.8
+	install -m 0755 ssi $(DESTDIR)$(CGIBINDIR)/ssi
+	install -m 0644 ssi.8 $(DESTDIR)$(MANDIR)/man8/ssi.8
+	install -m 0755 phf $(DESTDIR)$(CGIBINDIR)/phf
 
 clean:
 	rm -f $(CLEANFILES)