X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=GNUmakefile.in;h=99be2368e9aa5d477244bda7e5cd9b87cda88928;hp=31a0ee85a271f9313535ec4b68f518e76d5a2a07;hb=28efbd44fca2f28d83fc4570a6dec07d386adde9;hpb=8004016d83910a65437b03c17da08eb510d6cfcc

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 31a0ee85..99be2368 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,6 +1,6 @@
 # Note:  GNUmakefile is built automatically from GNUmakefile.in
 #
-# $Id: GNUmakefile.in,v 1.246 2016/05/03 13:21:24 fabiankeil Exp $
+# $Id: GNUmakefile.in,v 1.251 2016/05/08 12:46:15 fabiankeil Exp $
 #
 # Written by and Copyright (C) 2001-2016 members of the
 # Privoxy team. https://www.privoxy.org/
@@ -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 ; \
@@ -450,7 +452,8 @@ dok-user:
 	# FIXME: temp fix so same stylesheet gets in more than one place so it works
 	# for all doc set-ups, including the 'user manual' config option in local
 	# system where it MUST be in same directory as html.
-	$(PERL) -pi.bak -e 's/<\/head/\n<LINK REL=\"STYLESHEET\" TYPE=\"text\/css\" HREF=\"p_doc.css\">\n<\/head/i' doc/webserver/user-manual/*html
+	$(PERL) -pi.bak -e 's/<\/head/\n<LINK REL=\"STYLESHEET\" TYPE=\"text\/css\" HREF=\"p_doc.css\">\n<\/head/i' doc/webserver/user-manual/*html && \
+	rm doc/webserver/user-manual/*html.bak
 
 # faq
 dok-faq:
@@ -729,8 +732,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 "*~"`