Privoxy-Regression-Test: Add a "Default level offset" directive

[privoxy.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 3f4a3c5..d7a985d 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,6 +1,6 @@
 # Note:  GNUmakefile is built automatically from GNUmakefile.in
 #
-# $Id: GNUmakefile.in,v 1.245 2016/05/03 13:21:08 fabiankeil Exp $
+# $Id: GNUmakefile.in,v 1.250 2016/05/08 12:46:05 fabiankeil Exp $
 #
 # Written by and Copyright (C) 2001-2016 members of the
 # Privoxy team. https://www.privoxy.org/
@@ -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)
@@ -400,11 +402,11 @@ gen-clean:
 #############################################################################
 
 tarball-dist: dist-check clean clobber
-       $(LN) -s current ../privoxy-$(VERSION)-$(CODE_STATUS)
+       $(LN) -s `pwd` ../privoxy-$(VERSION)-$(CODE_STATUS)
 
        for i in `find . -type f -a -not \( -path "*/CVS*" -o -name ".*" \
        -o -path "*/debian/*" -o -path "*/actions/*" -o -name "*.php" -o \
-       -name "PACKAGERS" \) | sort`; do \
+       -name "PACKAGERS" -o -path "*.git/*" \) | sort`; do \
           files="$$files privoxy-$(VERSION)-$(CODE_STATUS)/$$i"; \
        done &&  \
        cd .. && $(TAR) -cvhf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar $$files ; \
@@ -729,8 +731,8 @@ $(PROGRAM): $(OBJS) $(W32_FILES)
 clean:
        $(RM) a.out $(OBJS) $(W32_FILES) $(W32_INIS) $(PROGRAM) default.action \
                config.base config.tmp \
-               `find . \( -name TAGS -o -name tags \) -and -not -path "./.git/refs/tags"` \
-               `find . -name "*.orig" -a -not -name rc.privoxy.orig`
+               `find . \( -name TAGS -o -name tags \) -a -not -path "./.git/*"` \
+               `find . -name "*.orig" -a -not -name rc.privoxy.orig -a -not -path "./.git/*"`
 
 clean-editor-files:
        $(RM) `find . -name "*~"`