X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=GNUmakefile.in;h=09213832a3a9861ea20a30d8d4ae88c52f5fa2d8;hb=19ca6a894e4487edef033586a6d32693d72826fb;hp=490944cfc23d3a66b705feb438a5536e87f5519b;hpb=2c21c275f8a2c5d3ce2fe283005ffcb27a4a52b0;p=privoxy.git diff --git a/GNUmakefile.in b/GNUmakefile.in index 490944cf..09213832 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,6 +1,6 @@ # Note: Makefile is built automatically from Makefile.in # -# $Id: GNUmakefile.in,v 1.34 2002/03/27 10:30:11 swa Exp $ +# $Id: GNUmakefile.in,v 1.45 2002/03/29 19:45:45 swa Exp $ # # Written by and Copyright (C) 2001 the SourceForge # Privoxy team. http://www.privoxy.org/ @@ -28,6 +28,11 @@ # Temple Place - Suite 330, Boston, MA 02111-1307, USA. # +############################################################################# +# Set make command correctly +############################################################################# +@SET_MAKE@ + ############################################################################# # Version number (for RPM) ############################################################################# @@ -46,9 +51,10 @@ RPM_PACKAGEV = @VERSION_RPM_PACKAGE@ # Directories for "make install" ############################################################################# -DEST = @sysconfdir@/privoxy -SBIN_DEST = @sbindir@ -MAN_DEST = @mandir@ +DEST = @prefix@ +CONFDEST = @prefix@@sysconfdir@ +SBIN_DEST = @prefix@@sbindir@ +MAN_DEST = @prefix@@mandir@ ############################################################################# @@ -59,7 +65,11 @@ PROGRAM = privoxy@EXEEXT@ CC = @CC@ ECHO = echo GZIP_PROG = gzip -INSTALL = cp -f +#INSTALL = cp -f +INSTALL = @INSTALL@ +INSTALL_P = -m 0750 -g @GROUP@ -o @USER@ -b +INSTALL_T = -m 0640 -g @GROUP@ -o @USER@ -b +INSTALL_D = -m 0750 -g @GROUP@ -o @USER@ -d LD = @CC@ RM = rm -f STRIP_PROG = strip @@ -68,7 +78,6 @@ CAT = cat RPM = rpm MV = mv TAR = tar -MAKE = make LN = ln WDUMP = @WDUMP@ -dump JADEBIN = @JADEBIN@ @@ -76,6 +85,12 @@ DB = $(JADEBIN) -t sgml -ihtml -D.. -d ldpOK.dsl\#html DB2HTML = @DB2HTML@ DKPREFIX = @DKPREFIX@ MAN2HTML = @MAN2HTML@ +G2H_CMD = groff -mandoc -Thtml +TARGET_OS = @host@ + +#User Group paras +USER = @USER@ +GROUP = @GROUP@ # Program to do LF->CRLF # @@ -105,7 +120,7 @@ C_SRC = actions.c cgi.c cgiedit.c cgisimple.c deanimate.c encode.c \ C_OBJS = $(C_SRC:.c=.@OBJEXT@) C_HDRS = $(C_SRC:.c=.h) project.h actionlist.h -CONFIG_FILES = config \ +CONFIG_FILES = config trust \ default.action \ basic.action intermediate.action advanced.action \ default.filter \ @@ -267,10 +282,10 @@ redhat-upload: # w3m http://sourceforge.net/project/admin/editpackages.php?group_id=11118 ############################################################################# -# sun solaris distribution +# generic distribution ############################################################################# -solaris-dist: +gen-dist: @$(ECHO) "" @$(ECHO) "You have run autoconf && autoheader && ./configure right?" @$(ECHO) "" @@ -278,32 +293,44 @@ solaris-dist: $(STRIP_PROG) $(PROGRAM) $(LN) -s current ../privoxy-$(VERSION)-$(CODE_STATUS) # add program - $(TAR) -C.. -cvhf privoxy-solaris-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$(PROGRAM) + cd .. && $(TAR) -cvhf privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$(PROGRAM) # add config files for foo in $(CONFIG_FILES); do \ - $(TAR) -C.. --exclude "CVS" --exclude "#*" --exclude ".#*" --exclude ".cvsignore" -uvhf privoxy-solaris-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$$foo; \ + cd .. && $(TAR) --exclude "CVS" --exclude "#*" --exclude ".#*" --exclude ".cvsignore" -uvhf privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$$foo; \ done; # add documentation for foo in $(DOC_FILES); do \ - $(TAR) -C.. --exclude "CVS" --exclude "#*" --exclude ".#*" --exclude ".cvsignore" -uvhf privoxy-solaris-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$$foo; \ + cd .. && $(TAR) --exclude "CVS" --exclude "#*" --exclude ".#*" --exclude ".cvsignore" -uvhf privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar privoxy-$(VERSION)-$(CODE_STATUS)/$$foo; \ done; # and zip the archive $(RM) ../privoxy-$(VERSION)-$(CODE_STATUS) - $(GZIP_PROG) privoxy-solaris-$(VERSION)-$(CODE_STATUS)-src.tar + $(GZIP_PROG) privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar @$(ECHO) Distribution with binary created. # anonymously ncftps the tarball to sourceforge -solaris-upload: - ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming privoxy-solaris-$(VERSION)-$(CODE_STATUS)-src.tar.gz +gen-upload: + ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar.gz @$(ECHO) ------------------------------------------------------- @$(ECHO) Now goto @$(ECHO) http://sourceforge.net/project/admin/editpackages.php?group_id=11118 @$(ECHO) ... and release the files. @$(ECHO) ------------------------------------------------------- +# use with care +gen-clean: + $(RM) privoxy-$(TARGET_OS)-$(VERSION)-$(CODE_STATUS)-src.tar* -solaris-clean: - $(RM) privoxy-solaris-$(VERSION)-$(CODE_STATUS)-src.tar* +############################################################################# +# solaris distribution +############################################################################# +solaris-dist: gen-dist + @$(ECHO) Done. +# anonymously ncftps the tarball to sourceforge +solaris-upload: gen-upload + @$(ECHO) Done. +# use with care +solaris-clean: gen-clean + @$(ECHO) Done. ############################################################################# # hpux distribution @@ -421,7 +448,7 @@ win-dist: ############################################################################# tarball-dist: clobber $(LN) -s current ../privoxy-$(VERSION)-$(CODE_STATUS) - $(TAR) -C.. --exclude "CVS" --exclude "#*" --exclude ".#*" --exclude ".cvsignore" -cvhzf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar.gz privoxy-$(VERSION)-$(CODE_STATUS) + cd .. && $(TAR) --exclude "CVS" --exclude "#*" --exclude ".#*" --exclude ".cvsignore" -cvhzf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar.gz privoxy-$(VERSION)-$(CODE_STATUS) $(RM) ../privoxy-$(VERSION)-$(CODE_STATUS) @$(ECHO) Tarball (without any binary) created. @@ -459,14 +486,18 @@ dok: doc/source/ldpOK.dsl man2html-swa rm -rf doc/webserver/faq cd doc/source && $(DB2HTML) -s ldpOK.dsl faq.sgml && mv faq ../webserver cd doc/source && $(DB2HTML) -s ldpOK.dsl --nochunks faq.sgml > tmp.html && lynx -dump tmp.html > ../text/faq.txt && rm -rf tmp.html faq +## kludge to force recreation on next run. Rodgrigo? + @rm -f doc/source/ldpOK.dsl man2html-swa: + mkdir -p doc/webserver/man-page if [ "$(MAN2HTML)" != "false" ]; then \ - mkdir -p doc/webserver/man-page; \ $(ECHO) "Privoxy|Doc/Man page

NAME

" > doc/webserver/man-page/privoxy-man-page.html; \ man ./privoxy.1 | $(MAN2HTML) -bare \ >> doc/webserver/man-page/privoxy-man-page.html; \ $(ECHO) "" >> doc/webserver/man-page/privoxy-man-page.html; \ + else \ + $(MAKE) groff2html; \ fi redhat-dok: doc/source/ldpOK.dsl man2html @@ -491,6 +522,9 @@ redhat-dok: doc/source/ldpOK.dsl man2html cd doc/source/faq && $(DB) ../faq.sgml && cd .. && mv faq ../webserver cd doc/source && $(DB) -V nochunks faq.sgml > tmp.html && $(WDUMP) \ tmp.html > ../text/faq.txt && rm -rf tmp.html faq +## kludge to force recreation on next run. Rodgrigo? + @rm -f doc/source/ldpOK.dsl + doc/source/ldpOK.dsl: if [ "$(DKPREFIX)" != "none" ]; then \ @@ -499,11 +533,21 @@ doc/source/ldpOK.dsl: cp doc/source/ldp.dsl doc/source/ldpOK.dsl; \ fi +# For those with man2html ala RH7's. man2html: + mkdir -p doc/webserver/man-page if [ "$(MAN2HTML)" != "false" ]; then \ $(MAN2HTML) privoxy.1 |grep -v "^Content-type" > doc/webserver/man-page/privoxy-man-page.html; \ + perl -pi -e 's///; s//man2html/' doc/webserver/man-page/privoxy-man-page.html; \ + else \ + $(MAKE) groff2html; \ fi +# Otherwise we get plain groff conversion. +groff2html: + $(G2H_CMD) ./privoxy.1 > doc/webserver/man-page/privoxy-man-page.html + + ############################################################################# # # Webserver @@ -517,10 +561,20 @@ webserver: @$(ECHO) Note that this command scps all stuff to the webserver, @$(ECHO) it will not remove obsolete documents. @$(ECHO) ------------------------------------------------------- - chmod -R a+r doc/webserver + find doc/webserver -type f -exec chmod 664 {} \; +# not sure if we need next line.swa. + chmod 775 doc/webserver/redirect.php find doc/webserver -type d -exec chmod a+rx {} \; cd doc/webserver && scp -Cr . ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/ +webquick: + find doc/webserver -type f -exec chmod 664 {} \; +# not sure if we need next line.swa. + chmod 775 doc/webserver/redirect.php + find doc/webserver -type d -exec chmod a+rx {} \; + cd doc/webserver/submit && scp -Cr . ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/submit + + ############################################################################# # Source file dependencies ############################################################################# @@ -586,10 +640,10 @@ $(PROGRAM): $(OBJS) $(W32_FILES) $(LD) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS) clean: - $(RM) a.out core $(OBJS) $(W32_FILES) $(W32_INIS) $(PROGRAM) junkbuster + $(RM) a.out core $(OBJS) $(W32_FILES) $(W32_INIS) $(PROGRAM) junkbuster config.log clobber: clean - $(RM) $(PROGRAM) cscope.* logfile *.pdb *.lib *.exp `find . -name tags` `find . -name TAGS` config.status config.h.in config.log junkbuster.log privoxy.log config.cache *~ *.tar.gz configure + $(RM) cscope.* logfile *.pdb *.lib *.exp `find . -name tags` `find . -name TAGS` config.status config.h.in config.log junkbuster.log privoxy.log config.cache *~ *.tar.gz configure tags: $(SRCS) $(HDRS) etags $(SRCS) $(HDRS) @@ -601,15 +655,17 @@ install: all # to be fixed! # $(STRIP_PROG) $(PROGRAM) - $(INSTALL) $(PROGRAM) $(SBIN_DEST) - mkdir -p $(DEST)/user-manual - mkdir -p $(DEST)/templates - cp -r doc/webserver/user-manual $(DEST) - cp -r templates $(DEST) - $(INSTALL) config default.action default.filter trust $(DEST) + $(INSTALL) $(INSTALL_D) $(SBIN_DEST) + $(INSTALL) $(INSTALL_D) $(DEST)/user-manual + $(INSTALL) $(INSTALL_D) $(DEST)/templates + $(INSTALL) $(INSTALL_D) $(CONFDEST) + $(INSTALL) $(INSTALL_P) $(PROGRAM) $(SBIN_DEST) + if [ -d "doc/webserver/user-manual" ]; then $(INSTALL) $(INSTALL_T) doc/webserver/user-manual $(DEST); fi + $(INSTALL) $(INSTALL_T) templates/[a-z]* $(DEST)/templates + $(INSTALL) $(INSTALL_T) config default.action default.filter trust $(CONFDEST) # FIXME $(ECHO) privoxy.logrotate privoxy.monthly privoxy.weekly # FIXME: Need new manual! $(GZIP_PROG) -c privoxy.1 > $(MAN_DEST)/privoxy.1.gz - $(INSTALL) privoxy.init /etc/init.d/privoxy + $(INSTALL) $(INSTALL_P) privoxy.init /etc/init.d/privoxy ############################################################################# @@ -619,6 +675,39 @@ install: all ## end: # $Log: GNUmakefile.in,v $ +# Revision 1.45 2002/03/29 19:45:45 swa +# for lazy swa +# +# Revision 1.44 2002/03/29 17:42:44 gliptak +# Correcting for Solaris tar limitations +# +# Revision 1.43 2002/03/29 07:40:03 swa +# fixed make webserver. doh +# +# Revision 1.42 2002/03/29 06:59:04 swa +# other users could not modify files on webserver +# +# Revision 1.41 2002/03/28 20:43:00 swa +# set make correctly +# +# Revision 1.40 2002/03/28 04:22:44 hal9 +# More on man2html stuff. +# +# Revision 1.39 2002/03/28 01:04:14 hal9 +# More man2html stuff for docs. +# +# Revision 1.38 2002/03/27 16:02:30 swa +# have a generic target +# +# Revision 1.37 2002/03/27 15:30:26 swa +# have a consistent appearance +# +# Revision 1.36 2002/03/27 14:58:08 swa +# can be used by mutilple targets +# +# Revision 1.35 2002/03/27 14:53:19 swa +# added solaris-dist +# # Revision 1.34 2002/03/27 10:30:11 swa # we want a html man file on the webserver #