X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=Makefile.in;h=338f97b528cc6abefe22caa3416f00a93a118c88;hp=67a1b6c2b11db2ba491b74090ad33dcb3e48a4a8;hb=2f113e3507f764f4406587c7117fce304b42df4f;hpb=9909c137068f41a1d2212ceb5496b07cde6d623f diff --git a/Makefile.in b/Makefile.in index 67a1b6c2..338f97b5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,6 @@ # Note: Makefile is built automatically from Makefile.in # -# $Id: Makefile.in,v 1.5 2001/06/03 13:57:26 swa Exp $ +# $Id: Makefile.in,v 1.12 2001/06/12 17:15:56 swa Exp $ # # Written by and Copyright (C) 2001 the SourceForge # IJBSWA team. http://ijbswa.sourceforge.net @@ -28,6 +28,32 @@ # Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # $Log: Makefile.in,v $ +# Revision 1.12 2001/06/12 17:15:56 swa +# fixes, because a clean build on rh6.1 was impossible. +# GZIP confuses make, %configure confuses rpm, etc. +# +# Revision 1.11 2001/06/11 11:26:35 sarantis +# RPM version should be the same as ijbswa version. The rpm release is +# specified in the specfile. +# +# Revision 1.10 2001/06/07 17:27:45 swa +# added suse build section +# +# Revision 1.9 2001/06/04 18:31:58 swa +# files are now prefixed with either `confdir' or `logdir'. +# `make redhat-dist' replaces both entries confdir and logdir +# with redhat values +# +# Revision 1.8 2001/06/04 10:44:57 swa +# `make redhatr-dist' now works. Except for the paths +# in the config file. +# +# Revision 1.7 2001/06/03 17:09:09 swa +# swa for oes: reversed my earlier change +# +# Revision 1.6 2001/06/03 17:07:27 swa +# swa for oes +# # Revision 1.5 2001/06/03 13:57:26 swa # compile cgi.c (for andreas' GUI) # @@ -53,7 +79,9 @@ VERSION_MAJOR = @VERSION_MAJOR@ VERSION_MINOR = @VERSION_MINOR@ VERSION_POINT = @VERSION_POINT@ VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_POINT) +# will automatically be postfixed with -$(RPM_PACKAGEV) in the SPECfile RPM_VERSION = $(VERSION) +RPM_PACKAGEV = 1 # The version is currently specified in config.h, which is # written by "configure". @@ -93,14 +121,14 @@ CFLAGS = @CFLAGS@ @CPPFLAGS@ \ PROGRAM = junkbuster@EXEEXT@ CC = gcc ECHO = echo -GZIP = gzip +GZIP_PROG = gzip INSTALL = cp -f LD = gcc OBJEXT = @OBJEXT@ RM = rm -f -STRIP = strip +STRIP_PROG = strip -C_SRC = cgi.c actions.c encode.c errlog.c filters.c gateway.c jbsockets.c \ +C_SRC = actions.c encode.c errlog.c filters.c gateway.c jbsockets.c \ jcc.c killpopup.c list.c loadcfg.c loaders.c miscutil.c \ parsers.c showargs.c ssplit.c cgi.c @@ -192,17 +220,30 @@ sregexp.txt: re_filterfile # ------------------------------------------------------------------------- -# +# redhat distribution # ------------------------------------------------------------------------- -rpm-dist: - @make clean +redhat-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-rh.spec | sed 's/^Version:.*/Version: $(RPM_VERSION)/g' | sed 's/^Release:.*/Release: $(RPM_PACKAGEV)/g' > /tmp/abc && cp -f /tmp/abc junkbuster-rh.spec + tar --exclude "CVS" --exclude "junkbuster-suse.spec" -cvzf ../ijbswa.tar.gz . +# verify all files in their correct location needs to be done + cd .. && rpm -ta ijbswa.tar.gz + +# ------------------------------------------------------------------------- +# suse distribution +# ------------------------------------------------------------------------- +suse-dist: + @make clobber # verify that i'm root needs to be done - cd .. && tar --exclude "ijb/CVS" -cvzf ijb.tar.gz ijb/ + rm -f ../ijbswa.tar.gz # verify all version strings, FLAGS, etc. in the spec file - cat ../../SPECS/junkbuster.spec | sed 's/^Version:.*/Version: $(RPM_VERSION)/g' | sed 's/^Release:.*/Release: $(VERSION_POINT)/g' > /tmp/abc && cp -f /tmp/abc ../../SPECS/junkbuster.spec - cd ../../ && rpm -ba SPECS/junkbuster.spec - chmod -R a+r ../../RPMS - chmod -R a+r ../../SRPMS + cat junkbuster-suse.spec | sed 's/^Version:.*/Version: $(RPM_VERSION)/g' | sed 's/^Release:.*/Release: $(RPM_PACKAGEV)/g' > /tmp/abc && cp -f /tmp/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 + cd .. && rpm -ta ijbswa.tar.gz # ------------------------------------------------------------------------- # @@ -228,7 +269,7 @@ tarball-dist: actions.@OBJEXT@: actions.c actions.h config.h $(PROJECT_H_DEPS) errlog.h jcc.h list.h loaders.h miscutil.h actionlist.h encode.@OBJEXT@: encode.c encode.h config.h errlog.@OBJEXT@: errlog.c errlog.h config.h $(PROJECT_H_DEPS) @WIN_ONLY@w32log.h -filters.@OBJEXT@: filters.c filters.h config.h $(PROJECT_H_DEPS) errlog.h encode.h gateway.h jbsockets.h jcc.h loadcfg.h parsers.h showargs.h ssplit.h @WIN_ONLY@win32.h +filters.@OBJEXT@: filters.c filters.h config.h $(PROJECT_H_DEPS) errlog.h encode.h gateway.h jbsockets.h jcc.h loadcfg.h parsers.h showargs.h ssplit.h @WIN_ONLY@win32.h cgi.h gateway.@OBJEXT@: gateway.c gateway.h config.h $(PROJECT_H_DEPS) errlog.h jbsockets.h jcc.h loadcfg.h jbsockets.@OBJEXT@: jbsockets.c jbsockets.h config.h $(PROJECT_H_DEPS) filters.h jcc.@OBJEXT@: jcc.c jcc.h config.h $(PROJECT_H_DEPS) errlog.h filters.h gateway.h jbsockets.h killpopup.h loadcfg.h loaders.h miscutil.h parsers.h showargs.h @WIN_ONLY@w32log.h win32.h cgi.h @@ -295,14 +336,14 @@ tags: $(SRCS) $(HDRS) etags $(SRCS) $(HDRS) install: all - $(STRIP) $(PROGRAM) + $(STRIP_PROG) $(PROGRAM) $(INSTALL) $(PROGRAM) $(SBIN_DEST) $(INSTALL) README README.TOO README.WIN README.re_filter README.cygwin $(DEST) $(INSTALL) aclfile blocklist config cookiefile forward imagelist \ popup re_filterfile trust $(DEST) # FIXME: On SuSE, these are not found. Where do they go? $(ECHO) junkbuster.logrotate junkbuster.monthly junkbuster.weekly - $(GZIP) -c junkbuster.1 > $(MAN_DEST)/junkbuster.1.gz + $(GZIP_PROG) -c junkbuster.1 > $(MAN_DEST)/junkbuster.1.gz $(INSTALL) junkbuster.init /sbin/init.d/junkbuster