X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=GNUmakefile.in;h=9476426ce4533f0638669a0290b575f3305b7602;hb=290d763f66f2dca3def6078ae075ce11c2225464;hp=a1151fd1dace9e3907372efefcbed267d75e633a;hpb=4a39c88bb798b039e2db687ec49b85af1c67f233;p=privoxy.git diff --git a/GNUmakefile.in b/GNUmakefile.in index a1151fd1..9476426c 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,6 +1,6 @@ # Note: GNUmakefile is built automatically from GNUmakefile.in # -# Written by and Copyright (C) 2001-2018 members of the +# Written by and Copyright (C) 2001-2021 members of the # Privoxy team. https://www.privoxy.org/ # # Based on the Internet Junkbuster originally written @@ -32,7 +32,7 @@ @SET_MAKE@ ############################################################################# -# Version number (for RPM) +# Version number ############################################################################# VERSION_MAJOR = @VERSION_MAJOR@ @@ -59,8 +59,8 @@ exec_prefix = @exec_prefix@ CONF_BASE = @sysconfdir@ SBIN_DEST = @sbindir@ MAN_DIR = @mandir@ -MAN_DEST = $(MAN_DIR)/man1 -MAN_PAGE = privoxy.1 +MAN_DEST = $(MAN_DIR)/man8 +MAN_PAGE = privoxy.8 SHARE_DEST = @datadir@ DOC_DEST = $(SHARE_DEST)/doc/privoxy VAR_DEST = @localstatedir@ @@ -247,19 +247,14 @@ PCRS_SRC = @STATIC_PCRS_ONLY@pcrs.c PCRS_OBJS = @STATIC_PCRS_ONLY@$(PCRS_SRC:.c=.@OBJEXT@) PCRS_HDRS = @STATIC_PCRS_ONLY@$(PCRS_SRC:.c=.h) -PCRE_SRC = @STATIC_PCRE_ONLY@pcre/get.c pcre/maketables.c pcre/study.c pcre/pcre.c -PCRE_OBJS = @STATIC_PCRE_ONLY@$(PCRE_SRC:.c=.@OBJEXT@) -PCRE_HDRS = @STATIC_PCRE_ONLY@pcre/config.h pcre/chartables.c pcre/internal.h pcre/pcre.h - # No REGEX (maybe because dynamically linked pcreposix): REGEX_SRC = -@STATIC_PCRE_ONLY@REGEX_SRC = pcre/pcreposix.c REGEX_OBJS = $(REGEX_SRC:.c=.@OBJEXT@) REGEX_HDRS = $(REGEX_SRC:.c=.h) # Dependencies introduced by #include "project.h". -PROJECT_H_DEPS = project.h $(REGEX_HDRS) $(PCRS_HDRS) @STATIC_PCRE_ONLY@pcre/pcre.h +PROJECT_H_DEPS = project.h $(REGEX_HDRS) $(PCRS_HDRS) # Socket libraries for platforms that need them explicitly defined SOCKET_LIB = @SOCKET_LIB@ @@ -267,9 +262,9 @@ SOCKET_LIB = @SOCKET_LIB@ # PThreads library, if needed. PTHREAD_LIB = @PTHREAD_ONLY@@PTHREAD_LIB@ -SRCS = $(C_SRC) $(CLIENT_TAG_SRC) $(FUZZ_SRC) $(W32_SRC) $(PCRS_SRC) $(PCRE_SRC) $(REGEX_SRC) $(SSL_SRC) $(MBEDTLS_SRC) $(OPENSSL_SRC) -OBJS = $(C_OBJS) $(CLIENT_TAG_OBJS) $(FUZZ_OBJS) $(W32_OBJS) $(PCRS_OBJS) $(PCRE_OBJS) $(REGEX_OBJS) $(SSL_OBJS) $(MBEDTLS_OBJS) $(OPENSSL_OBJS) -HDRS = $(C_HDRS) $(W32_HDRS) $(PCRS_HDRS) $(PCRE_OBJS) $(REGEX_HDRS) $(SSL_HDRS) $(MBEDTLS_HDRS) $(OPENSSL_HDRS) +SRCS = $(C_SRC) $(CLIENT_TAG_SRC) $(FUZZ_SRC) $(W32_SRC) $(PCRS_SRC) $(REGEX_SRC) $(SSL_SRC) $(MBEDTLS_SRC) $(OPENSSL_SRC) +OBJS = $(C_OBJS) $(CLIENT_TAG_OBJS) $(FUZZ_OBJS) $(W32_OBJS) $(PCRS_OBJS) $(REGEX_OBJS) $(SSL_OBJS) $(MBEDTLS_OBJS) $(OPENSSL_OBJS) +HDRS = $(C_HDRS) $(W32_HDRS) $(PCRS_HDRS) $(REGEX_HDRS) $(SSL_HDRS) $(MBEDTLS_HDRS) $(OPENSSL_HDRS) LIBS = @LIBS@ $(W32_LIB) $(SOCKET_LIB) $(PTHREAD_LIB) @@ -287,8 +282,7 @@ SPECIAL_CFLAGS = @SPECIAL_CFLAGS@ # Add your flags here OTHER_CFLAGS = -CFLAGS = @CFLAGS@ @CPPFLAGS@ $(OTHER_CFLAGS) $(SPECIAL_CFLAGS) -Wall \ - @STATIC_PCRE_ONLY@ -Ipcre +CFLAGS = @CFLAGS@ @CPPFLAGS@ $(OTHER_CFLAGS) $(SPECIAL_CFLAGS) -Wall LDFLAGS = @LDFLAGS@ $(DEBUG_CFLAGS) $(SPECIAL_CFLAGS) @@ -445,7 +439,8 @@ 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" -o -path "*.git/*" \) | sort`; do \ + -name "PACKAGERS" -o -path "*.git/*" \ + -o -path "*/doc/webserver/feeds*" \) | sort`; do \ files="$$files privoxy-$(VERSION)-$(CODE_STATUS)/$$i"; \ done && \ cd .. && $(TAR) -cvhf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar $$files ; \ @@ -461,7 +456,8 @@ mtree-spec: $(ECHO) "#mtree 2.0" > $(MTREE_SPEC_FILE) for i in `find . -type f -a -not \( -path "*/CVS*" -o -name ".*" \ -o -path "*/debian/*" -o -path "*/actions/*" -o -name "*.php" -o \ - -name "PACKAGERS" -o -path "*.git/*" -o -name "*.spec" \) | env -i sort`; do \ + -name "PACKAGERS" -o -path "*.git/*" -o -name "*.spec" \ + -o -path "*/doc/webserver/feeds*" \) | env -i sort`; do \ $(ECHO) "privoxy-$(VERSION)-$(CODE_STATUS)/$$i time=$(SOURCE_DATE_EPOCH) type=file uname=privoxy gname=privoxy mode=0555"; \ done >> $(MTREE_SPEC_FILE) $(RM) ../privoxy-$(VERSION)-$(CODE_STATUS) @@ -572,6 +568,7 @@ groff2html: dok-readme: dok-release cd doc/source && $(DB_TXT)-notoc -V nochunks readme.sgml > tmp.html &&\ $(W3M_DUMP) tmp.html > ../../README ;\ + $(PERL) -pi'' -e 's@doc/source/readme\.sgml@README@' ../../README; \ $(DB_TXT)-notoc -V nochunks install.sgml > tmp.html &&\ $(W3M_DUMP) tmp.html > ../../INSTALL ;\ $(RM) tmp.* @@ -586,7 +583,9 @@ dok-webserver: s/<\/HEAD/\n<\/HEAD/;\ s/\.\d\. //;\ s/__copy/©/;\ - s@(\1@; s@(
\1@; s@(\n\1@; \ + s@www.lalal.ai@