Christian Wiese
14 years ago
2 changed files with 19 additions and 16 deletions
@ -2,6 +2,7 @@ |
|||||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||||
#
|
#
|
||||||
# Filename: package/.../privoxy/makefile.patch
|
# Filename: package/.../privoxy/makefile.patch
|
||||||
|
# Copyright (C) 2011 The OpenSDE Project
|
||||||
# Copyright (C) 2004 - 2006 The T2 SDE Project
|
# Copyright (C) 2004 - 2006 The T2 SDE Project
|
||||||
#
|
#
|
||||||
# More information can be found in the files COPYING and README.
|
# More information can be found in the files COPYING and README.
|
||||||
@ -13,21 +14,23 @@ |
|||||||
# Foundation; either version 2 of the License, or (at your option) any later
|
# Foundation; either version 2 of the License, or (at your option) any later
|
||||||
# version.
|
# version.
|
||||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||||
install config files so that a user can use this as template
|
|
||||||
|
1.) do not run `install strip` because our install-wrapper doesn't like it
|
||||||
|
2.) install config files so that a user can use this as template
|
||||||
- Sebastian Czech <[email protected]>
|
- Sebastian Czech <[email protected]>
|
||||||
|
|
||||||
--- privoxy-3.0.3-stable/GNUmakefile.in.orig 2004-01-31 02:15:33.000000000 +0100
|
--- privoxy-3.0.17-stable/GNUmakefile.in.orig 2010-02-20 13:53:30.000000000 +0100
|
||||||
+++ privoxy-3.0.3-stable/GNUmakefile.in 2005-03-28 15:21:00.420358736 +0200
|
+++ privoxy-3.0.17-stable/GNUmakefile.in 2011-05-12 09:17:07.732002068 +0200
|
||||||
@@ -1090,7 +1090,7 @@
|
@@ -807,7 +807,7 @@
|
||||||
@test -n "$(STRIP)" &&\
|
@test -n "$(STRIP)" &&\
|
||||||
$(ECHO) Installing $(PROGRAM) stripped executable to $(SBIN_DEST) ||\
|
$(ECHO) Installing $(PROGRAM) stripped executable to $(SBIN_DEST) ||\
|
||||||
$(ECHO) Installing $(PROGRAM) executable to $(SBIN_DEST)
|
$(ECHO) Installing $(PROGRAM) executable to $(DESTDIR)$(SBIN_DEST)
|
||||||
- $(INSTALL) $(INSTALL_P) $(STRIP) $(PROGRAM) $(SBIN_DEST)
|
- $(INSTALL) $(INSTALL_P) $(STRIP) $(PROGRAM) $(DESTDIR)$(SBIN_DEST)
|
||||||
+ $(INSTALL) $(INSTALL_P) $(PROGRAM) $(SBIN_DEST)
|
+ $(INSTALL) $(INSTALL_P) $(PROGRAM) $(DESTDIR)$(SBIN_DEST)
|
||||||
|
|
||||||
@# Install the DOCS and man page. install-sh only does one file at a time.
|
@# Install the DOCS and man page. install-sh only does one file at a time.
|
||||||
-@if [ $(check_doc) = 0 ]; then \
|
@# FIXME: only handles jpegs.
|
||||||
@@ -1144,38 +1144,10 @@
|
@@ -868,38 +868,10 @@
|
||||||
@# FIXME: group/user validation is overly convoluted.
|
@# FIXME: group/user validation is overly convoluted.
|
||||||
@# If superuser install ... we require a minimum of group ownership
|
@# If superuser install ... we require a minimum of group ownership
|
||||||
@# of those files the daemon writes to, to be non-root owned.
|
@# of those files the daemon writes to, to be non-root owned.
|
||||||
@ -63,10 +66,10 @@ install config files so that a user can use this as template |
|||||||
- fi ;\
|
- fi ;\
|
||||||
- INSTALL_CONF="$(INSTALL_R)" ;\
|
- INSTALL_CONF="$(INSTALL_R)" ;\
|
||||||
- fi ;\
|
- fi ;\
|
||||||
+
|
+
|
||||||
+ INSTALL_CONF="$(INSTALL_R) -o $(USER) -g $(GROUP_T)" ;\
|
+ INSTALL_CONF="$(INSTALL_R) -o $(USER) -g $(GROUP_T)" ;\
|
||||||
+ GROUP_T=$(GROUP_T) ;\
|
+ GROUP_T=$(GROUP_T) ;\
|
||||||
+
|
+
|
||||||
$(ECHO) Installing configuration files to $(CONF_DEST);\
|
$(ECHO) Installing configuration files to $(DESTDIR)$(CONF_DEST);\
|
||||||
for i in $(CONFIGS); do \
|
for i in $(CONFIGS); do \
|
||||||
if [ -s "$(CONF_DEST)/$$i" ] ; then \
|
if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] ; then \
|
||||||
|
|||||||
Loading…
Reference in new issue