X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=GNUmakefile.in;h=edeacfcfebdba1c21cdc747fdf7fe48afb5113af;hp=04933670aab9a9d37feb522799128ca0ecda3a2e;hb=65e38359d73dc0e1d2c7d7dc6ad98c39d08f9a88;hpb=061a6415261830282bd38413c631708e47d4cfef diff --git a/GNUmakefile.in b/GNUmakefile.in index 04933670..edeacfcf 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,6 +1,6 @@ # Note: Makefile is built automatically from Makefile.in # -# $Id: GNUmakefile.in,v 1.8 2002/03/05 14:07:42 morcego Exp $ +# $Id: GNUmakefile.in,v 1.19 2002/03/22 20:53:03 morcego Exp $ # # Written by and Copyright (C) 2001 the SourceForge # IJBSWA team. http://ijbswa.sourceforge.net @@ -28,6 +28,87 @@ # Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # $Log: GNUmakefile.in,v $ +# Revision 1.19 2002/03/22 20:53:03 morcego +# - Ongoing process to change name to JunkbusterNG +# - configure/configure.in: no change needed +# - GNUmakefile.in: +# - TAR_ARCH = /tmp/JunkbusterNG-$(RPM_VERSION).tar.gz +# - PROGRAM = jbng@EXEEXT@ +# - rh-spec now references as junkbusterng-rh.spec +# - redhat-upload: references changed to junkbusterng-* (package names) +# - tarball-dist: references changed to JunkbusterNG-distribution-* +# - tarball-src: now JunkbusterNG-* +# - install: initscript now junkbusterng.init and junkbusterng (when +# installed) +# - junkbuster-rh.spec: renamed to junkbusterng-rh.spec +# - junkbusterng.spec: +# - References to the expression ijb where changed where possible +# - New package name: junkbusterng (all in lower case, acording to +# the LSB recomendation) +# - Version changed to: 2.9.13 +# - Release: 1 +# - Added: junkbuster to obsoletes and conflicts (Not sure this is +# right. If it obsoletes, why conflict ? Have to check it later) +# - Summary changed: Stefan, please check and aprove it +# - Changes description to use the new name +# - Sed string was NOT changed. Have to wait to the manpage to +# change first +# - Keeping the user junkbuster for now. It will require some aditional +# changes on the script (scheduled for the next specfile release) +# - Added post entry to move the old logfile to the new log directory +# - Removing "chkconfig --add" entry (not good to have it automaticaly +# added to the startup list). +# - Added preun section to stop the service with the old name, as well +# as remove it from the startup list +# - Removed the chkconfig --del entry from the conditional block on +# the preun scriptlet (now handled on the %files section) +# - junkbuster.init: renamed to junkbusterng.init +# - junkbusterng.init: +# - Changed JB_BIN to jbng +# - Created JB_OBIN with the old value of JB_BIN (junkbuster), to +# be used where necessary (config dir) +# +# Aditional notes: +# - The config directory is /etc/junkbuster yet. Have to change it on the +# specfile, after it is changes on the code +# - The only files that got renamed on the cvs tree were the rh specfile and +# the init file. Some file references got changes on the makefile and on the +# rh-spec (as listed above) +# +# Revision 1.18 2002/03/21 23:00:00 swa +# want to autogenerate stuff. +# +# Revision 1.17 2002/03/19 19:30:04 morcego +# - Fixing stylesheet checking on configure. If it is found, no further checks +# should be done +# +# - configure will now check for db2html or docbook2html (should work now +# on SuSe without the docbktls package) +# +# Revision 1.16 2002/03/14 22:32:32 hal9 +# Bumped the RPM version. +# +# Revision 1.15 2002/03/08 20:00:28 swa +# some leftovers. +# +# Revision 1.14 2002/03/07 18:25:56 swa +# synced redhat and suse build process +# +# Revision 1.13 2002/03/07 17:17:56 oes +# (Hopefully) fixed for older make versions +# +# Revision 1.12 2002/03/07 15:28:27 swa +# more informative +# +# Revision 1.11 2002/03/06 14:33:18 sarantis +# Use proper temp file, not "abc". +# +# Revision 1.10 2002/03/06 14:19:35 sarantis +# Cleanup PID_FILE_PATH from redhat-dist target +# +# Revision 1.9 2002/03/05 17:31:11 morcego +# Search for docbook.dsl. Should solve portability problems for SuSe. +# # Revision 1.8 2002/03/05 14:07:42 morcego # configure now detects rpm topdir, and change GNUmakefile acordingly # (based on sugestion by Sarantis Paskalis) @@ -230,7 +311,7 @@ CODE_STATUS = @CODE_STATUS@ VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_POINT) # will automatically be postfixed with -$(RPM_PACKAGEV) in the SPECfile RPM_VERSION = $(VERSION) -RPM_PACKAGEV = 1 +RPM_PACKAGEV = 3 ############################################################################# @@ -246,7 +327,7 @@ MAN_DEST = @mandir@ # Build tools ############################################################################# -PROGRAM = junkbuster@EXEEXT@ +PROGRAM = jbng@EXEEXT@ CC = @CC@ ECHO = echo GZIP_PROG = gzip @@ -254,16 +335,17 @@ INSTALL = cp -f LD = @CC@ RM = rm -f STRIP_PROG = strip -SED = sed +SED = sed CAT = cat RPM = rpm -MV = mv +MV = mv TAR = tar MAKE = make LN = ln WDUMP = @WDUMP@ -dump JADEBIN = @JADEBIN@ DB = $(JADEBIN) -t sgml -ihtml -D.. -d ldpOK.dsl\#html +DB2HTML = @DB2HTML@ DKPREFIX = @DKPREFIX@ # Program to do LF->CRLF @@ -279,7 +361,7 @@ DOSFILTER = perl -p -e 's/\n/\r\n/' # Setup for make distribution rh and suse for now ############################################################################# -TAR_ARCH = /tmp/ijbswa-$(RPM_VERSION).tar.gz +TAR_ARCH = /tmp/JunkbusterNG-$(RPM_VERSION).tar.gz RPM_BASE = @RPM_BASE@ ############################################################################# @@ -299,7 +381,7 @@ W32_FILES = @WIN_ONLY@w32.res W32_OBJS = @WIN_ONLY@$(W32_SRC:.c=.@OBJEXT@) $(W32_FILES) W32_HDRS = @WIN_ONLY@w32log.h w32taskbar.h win32.h w32res.h W32_LIB = @WIN_ONLY@-lwsock32 -lcomctl32 -W32_INIS = @WIN_ONLY@config.txt trust.txt re_filterfile.txt +W32_INIS = @WIN_ONLY@config.txt trust.txt PCRS_SRC = @STATIC_PCRS_ONLY@pcrs.c PCRS_OBJS = @STATIC_PCRS_ONLY@$(PCRS_SRC:.c=.@OBJEXT@) @@ -387,12 +469,13 @@ config.txt: config $(SED) -e 's!\trustfile trust!trustfile trust.txt!' \ -e 's!\jarfile jarfile!jarfile jar.log!' \ -e 's!\logfile logfile!logfile junkbuster.log!' \ - -e 's!\re_filterfile re_filterfile!re_filterfile re_filterfile.txt!' \ -e 's!#Win32-only: !!' \ < $< | \ $(DOSFILTER) > $@ - # LF to CRLF in ijb.action - $(DOSFILTER) ijb.action.txt && mv ijb.action.txt ijb.action + # LF to CRLF in default.action + $(DOSFILTER) default.action.txt && mv default.action.txt default.action + # LF to CRLF in default.filter + $(DOSFILTER) default.filter.txt && mv default.filter.txt default.filter trust.txt: trust $(DOSFILTER) < $< > $@ @@ -406,31 +489,39 @@ re_filterfile.txt: re_filterfile ############################################################################# redhat-dist: - @for dir in RPMS SRPMS BUILD SOURCES SPECS; do \ + for dir in RPMS SRPMS BUILD SOURCES SPECS; do \ if [ ! -w $(RPM_BASE)/$$dir ]; then \ $(ECHO) "$(RPM_BASE)/$$dir is not writable for you. Maybe try as root."; \ - exit; \ + $(ECHO) "Or add a suitable path to .rpmmacros like."; \ + $(ECHO) "%_topdir /home/foo/rpm-build"; \ + exit 1; \ fi; \ - done ; \ - $(MAKE) clobber; \ - [ -f $(TAR_ARCH) ] && $(RM) $(TAR_ARCH); \ - $(CAT) junkbuster-rh.spec | \ - $(SED) 's/^Version:.*/Version: $(RPM_VERSION)/g;s/^Release:.*/Release: $(RPM_PACKAGEV)/g' > abc && \ - $(MV) -f abc junkbuster-rh.spec; \ - $(CAT) junkbuster.init | \ - $(SED) 's#JB_PID=.*/\(.*\.pid\).*#JB_PID=@PID_FILE_PATH@/\1#g' > abc && \ - $(MV) -f abc junkbuster.init; \ - $(TAR) --exclude "CVS" --exclude "junkbuster-suse.spec" -cvzf $(TAR_ARCH) . ; \ - $(RPM) --clean -ta $(TAR_ARCH); \ - [ -f $(TAR_ARCH) ] && $(RM) $(TAR_ARCH) + done; \ + + $(MAKE) clobber + if [ -f $(TAR_ARCH) ]; then $(RM) $(TAR_ARCH); fi + + TMPFILE=$$(mktemp -q /tmp/$(PROGRAM).XXXXXX); \ + if $(SED) -e 's/^\(Version:\).*/\1 $(RPM_VERSION)/g' \ + -e 's/^\(Release:\).*/\1 $(RPM_PACKAGEV)/g' \ + junkbusterng-rh.spec > $$TMPFILE ; then \ + $(MV) -f $$TMPFILE junkbusterng-rh.spec; \ + else \ + $(ECHO) "Could not set version info in specfile."; \ + exit 1;\ + fi + + $(TAR) --exclude "CVS" --exclude "junkbuster-suse.spec" -czf $(TAR_ARCH) . + $(RPM) --clean -ta $(TAR_ARCH) + if [ -f $(TAR_ARCH) ]; then $(RM) $(TAR_ARCH); fi # # anonymously ncftps the rpms to sourceforge # redhat-upload: - ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming $(RPM_BASE)/SRPMS/junkbuster-$(RPM_VERSION)-$(RPM_PACKAGEV).src.rpm + ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming $(RPM_BASE)/SRPMS/junkbusterng-$(RPM_VERSION)-$(RPM_PACKAGEV).src.rpm # better should use `arch` here instead of ix86 to support other platforms too - ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming $(RPM_BASE)/RPMS/*/junkbuster-$(RPM_VERSION)-$(RPM_PACKAGEV).*.rpm + ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming $(RPM_BASE)/RPMS/*/junkbusterng-$(RPM_VERSION)-$(RPM_PACKAGEV).*.rpm @$(ECHO) ------------------------------------------------------- @$(ECHO) Now goto @$(ECHO) http://sourceforge.net/project/admin/editpackages.php?group_id=11118 @@ -449,26 +540,39 @@ solaris-dist: ############################################################################# suse-dist: - @make clobber -# verify that i'm root needs to be done - rm -f ../ijbswa.tar.gz -# verify all version strings, FLAGS, etc. in the spec file - cat junkbuster-suse.spec | sed 's/^Version:.*/Version: $(RPM_VERSION)/g' | sed 's/^Release:.*/Release: $(RPM_PACKAGEV)/g' > abc && mv -f abc junkbuster-suse.spec - tar --exclude "CVS" --exclude "junkbuster-rh.spec" -cvzf ../ijbswa.tar.gz . -# verify all files in their correct location needs to be done -# never use buildroot to define the location inside the spec -# file or suse will fuck up the build process. - cd .. && rpm -ta --buildroot /tmp/xxx ijbswa.tar.gz - chmod a+r /usr/src/packages/SRPMS/* - chmod a+r /usr/src/packages/RPMS/i386/* + for dir in RPMS SRPMS BUILD SOURCES SPECS; do \ + if [ ! -w $(RPM_BASE)/$$dir ]; then \ + $(ECHO) "$(RPM_BASE)/$$dir is not writable for you. Maybe try as root."; \ + $(ECHO) "Or add a suitable path to .rpmmacros like."; \ + $(ECHO) "%_topdir /home/foo/rpm-build"; \ + exit 1; \ + fi; \ + done; \ + + $(MAKE) clobber + if [ -f $(TAR_ARCH) ]; then $(RM) $(TAR_ARCH); fi + + TMPFILE=$$(mktemp -q /tmp/$(PROGRAM).XXXXXX); \ + if $(SED) -e 's/^\(Version:\).*/\1 $(RPM_VERSION)/g' \ + -e 's/^\(Release:\).*/\1 $(RPM_PACKAGEV)/g' \ + junkbuster-suse.spec > $$TMPFILE ; then \ + $(MV) -f $$TMPFILE junkbuster-suse.spec; \ + else \ + $(ECHO) "Could not set version info in specfile."; \ + exit 1;\ + fi + + $(TAR) --exclude "CVS" --exclude "junkbuster-rh.spec" -czf $(TAR_ARCH) . + $(RPM) --clean -ta $(TAR_ARCH) + if [ -f $(TAR_ARCH) ]; then $(RM) $(TAR_ARCH); fi # # anonymously ncftps the rpms to sourceforge # suse-upload: - ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming /usr/src/packages/SRPMS/junkbuster-suse-$(RPM_VERSION)-$(RPM_PACKAGEV).src.rpm + ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming $(RPM_BASE)/SRPMS/junkbuster-suse-$(RPM_VERSION)-$(RPM_PACKAGEV).src.rpm # better should use `arch` here instead of ix86 to support other platforms too - ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming /usr/src/packages/RPMS/*/junkbuster-suse-$(RPM_VERSION)-$(RPM_PACKAGEV).*.rpm + ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming $(RPM_BASE)/RPMS/*/junkbuster-suse-$(RPM_VERSION)-$(RPM_PACKAGEV).*.rpm @$(ECHO) ------------------------------------------------------- @$(ECHO) Now goto @$(ECHO) http://sourceforge.net/project/admin/editpackages.php?group_id=11118 @@ -479,6 +583,8 @@ suse-upload: suse-clean: rpm -e junkbuster-suse rm -rf /etc/junkbuster + rm -rf /etc/rc.d/junkbuster* + rm -rf /var/run/junkbuster.pid rm -rf /var/log/junkbuster rm -f /etc/init.d/junkbuster rm -f /usr/sbin/junkbuster @@ -499,8 +605,8 @@ tarball-dist: @make clean make $(PROGRAM) # remove all objects and create the tarball with the binary - cd .. && $(RM) ijb/a.out ijb/core ijb/*.@OBJEXT@ && tar --exclude "ijb/CVS" -cvzf ../ijb-distribution-$(VERSION).tar.gz ijb/ - chmod a+r ../../ijb-distribution-$(VERSION).tar.gz + cd .. && $(RM) ijb/a.out ijb/core ijb/*.@OBJEXT@ && tar --exclude "ijb/CVS" -cvzf ../JunkbusterNG-distribution-$(VERSION).tar.gz ijb/ + chmod a+r ../../JunkbusterNG-distribution-$(VERSION).tar.gz @$(ECHO) Tarball with binary created. ############################################################################# @@ -514,16 +620,16 @@ dok: doc/source/ldpOK.dsl mkdir -p doc/text doc/man # user manual rm -rf doc/webserver/user-manual - cd doc/source && db2html -s ldpOK.dsl user-manual.sgml && mv user-manual ../webserver - cd doc/source && db2html -s ldpOK.dsl --nochunks user-manual.sgml > tmp.html && lynx -dump tmp.html > ../text/user-manual.txt && rm -rf tmp.html user-manual + cd doc/source && $(DB2HTML) -s ldpOK.dsl user-manual.sgml && mv user-manual ../webserver + cd doc/source && $(DB2HTML) -s ldpOK.dsl --nochunks user-manual.sgml > tmp.html && lynx -dump tmp.html > ../text/user-manual.txt && rm -rf tmp.html user-manual ## developer manual rm -rf doc/webserver/developer-manual - cd doc/source && db2html -s ldpOK.dsl developer-manual.sgml && mv developer-manual ../webserver - cd doc/source && db2html -s ldpOK.dsl --nochunks developer-manual.sgml > tmp.html && lynx -dump tmp.html > ../text/developer-manual.txt && rm -rf tmp.html developer-manual + cd doc/source && $(DB2HTML) -s ldpOK.dsl developer-manual.sgml && mv developer-manual ../webserver + cd doc/source && $(DB2HTML) -s ldpOK.dsl --nochunks developer-manual.sgml > tmp.html && lynx -dump tmp.html > ../text/developer-manual.txt && rm -rf tmp.html developer-manual ## faq 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 + 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 redhat-dok: doc/source/ldpOK.dsl mkdir -p doc/text doc/man doc/source/user-manual \ @@ -646,9 +752,9 @@ tags: $(SRCS) $(HDRS) etags $(SRCS) $(HDRS) tarball-src: clobber - $(LN) -s current ../ijb-$(VERSION)-$(CODE_STATUS) - $(TAR) -C.. -cvhzf ijb-$(VERSION)-$(CODE_STATUS)-src.tar.gz ijb-$(VERSION)-$(CODE_STATUS) - $(RM) ../ijb-$(VERSION)-$(CODE_STATUS) + $(LN) -s current ../JunkbusterNG-$(VERSION)-$(CODE_STATUS) + $(TAR) -C.. -cvhzf JunkbusterNG-$(VERSION)-$(CODE_STATUS)-src.tar.gz JunkbusterNG-$(VERSION)-$(CODE_STATUS) + $(RM) ../JunkbusterNG-$(VERSION)-$(CODE_STATUS) install: all # @@ -662,10 +768,10 @@ install: all mkdir -p $(DEST)/templates cp -r doc/webserver/user-manual $(DEST) cp -r templates $(DEST) - $(INSTALL) config ijb.action re_filterfile trust $(DEST) + $(INSTALL) config default.action default.filter trust $(DEST) # FIXME $(ECHO) junkbuster.logrotate junkbuster.monthly junkbuster.weekly # FIXME: Need new manual! $(GZIP_PROG) -c junkbuster.1 > $(MAN_DEST)/junkbuster.1.gz - $(INSTALL) junkbuster.init /etc/init.d/junkbuster + $(INSTALL) junkbusterng.init /etc/init.d/junkbusterng #############################################################################