pcrs_compile_replacement(): Silence a coverity warning (CID #161203)

[privoxy.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 92bea98..aa4336b 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,9 +1,9 @@
 # Note:  GNUmakefile is built automatically from GNUmakefile.in
 #
-# $Id: GNUmakefile.in,v 1.243 2016/04/10 08:09:07 fabiankeil Exp $
+# $Id: GNUmakefile.in,v 1.247 2016/05/08 10:44:09 fabiankeil Exp $
 #
-# Written by and Copyright (C) 2001-2014 members of the
-# Privoxy team. http://www.privoxy.org/
+# Written by and Copyright (C) 2001-2016 members of the
+# Privoxy team. https://www.privoxy.org/
 #
 # Based on the Internet Junkbuster originally written
 # by and Copyright (C) 1997 Anonymous Coders and
@@ -175,11 +175,11 @@ CONFIGS =         config trust default.action match-all.action \
 # are included here
 # and escape every '#' in the find. doh.
 CONFIG_FILES = $(CONFIGS) \
-               `find templates/ -type f | grep -v "CVS" | grep -v "\.\#" | grep -v ".*~" | grep -v ".cvsignore" | grep -v "TAGS"`
+               `find templates/ -type f | grep -v "CVS" | grep -v "\.\#" | grep -v ".*~" | grep -v ".cvsignore" | grep -v "TAGS" | sort`
 
 DOC_FILES = AUTHORS LICENSE README ChangeLog INSTALL \
-               `find doc/webserver/ -name "*.html" | grep -v "\(webserver\|team\)\/index\.html"` \
-               `find doc/webserver/ -name "*.css"` \
+               `find doc/webserver/ -name "*.html" | grep -v "\(webserver\|team\)\/index\.html" | sort` \
+               `find doc/webserver/ -name "*.css" | sort` \
                 $(MAN_PAGE)
 
 #############################################################################
@@ -365,7 +365,7 @@ gen-dist: dist-check
        @$(ECHO) ""
        $(MAKE) $(PROGRAM)
        $(STRIP_PROG) $(PROGRAM)
-       $(LN) -s current ../privoxy-$(VERSION)-$(CODE_STATUS)
+       $(LN) -s `pwd` ../privoxy-$(VERSION)-$(CODE_STATUS)
 # add program
        (cd .. && $(TAR) --exclude "PACKAGERS" -cvhf $(GEN_DIST_TAR_NAME) privoxy-$(VERSION)-$(CODE_STATUS)/$(PROGRAM))
 # add config files
@@ -376,6 +376,8 @@ gen-dist: dist-check
        for foo in $(DOC_FILES); do \
                (cd .. && $(TAR) --exclude "PACKAGERS" -uvhf $(GEN_DIST_TAR_NAME) privoxy-$(VERSION)-$(CODE_STATUS)/$$foo;) \
        done;
+# add tools
+       (cd .. && $(TAR) -uvhf $(GEN_DIST_TAR_NAME) privoxy-$(VERSION)-$(CODE_STATUS)/tools)
 # and zip the archive
        $(RM) ../privoxy-$(VERSION)-$(CODE_STATUS)
        $(GZIP_PROG) ../$(GEN_DIST_TAR_NAME)
@@ -404,7 +406,7 @@ tarball-dist: dist-check clean clobber
 
        for i in `find . -type f -a -not \( -path "*/CVS*" -o -name ".*" \
        -o -path "*/debian/*" -o -path "*/actions/*" -o -name "*.php" -o \
-       -name "PACKAGERS" \)`; do \
+       -name "PACKAGERS" \) | sort`; do \
           files="$$files privoxy-$(VERSION)-$(CODE_STATUS)/$$i"; \
        done &&  \
        cd .. && $(TAR) -cvhf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar $$files ; \