X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=GNUmakefile.in;h=99be2368e9aa5d477244bda7e5cd9b87cda88928;hb=bc85e84cb011791a5b7f60316cea3a3e697a6b87;hp=aa4336b058e4924115e297fba0fe4c7f738c8d71;hpb=845307b78eef8e6fd521834a3dd6ad890ddf1fd5;p=privoxy.git
diff --git a/GNUmakefile.in b/GNUmakefile.in
index aa4336b0..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.247 2016/05/08 10:44:09 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/
@@ -402,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 ; \
@@ -452,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\n<\/head/i' doc/webserver/user-manual/*html
+ $(PERL) -pi.bak -e 's/<\/head/\n\n<\/head/i' doc/webserver/user-manual/*html && \
+ rm doc/webserver/user-manual/*html.bak
# faq
dok-faq:
@@ -731,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 "*~"`