X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=Makefile.in;h=7366bf02710f991103c4aae86a5c789b42044aa9;hb=27e7ab19921a75f023658b07d314719875be2062;hp=49c613b55520b48e23486eeef7d0a06bf09d7b12;hpb=3b3a3699275014838fe9562233d0973d58875d64;p=privoxy.git

diff --git a/Makefile.in b/Makefile.in
index 49c613b5..7366bf02 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,6 @@
 # Note:  Makefile is built automatically from Makefile.in
 #
-# $Id: Makefile.in,v 1.30 2001/09/19 17:55:49 oes Exp $
+# $Id: Makefile.in,v 1.37 2001/11/01 00:52:04 hal9 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.37  2001/11/01 00:52:04  hal9
+# Redhat-upload stuff per Stefan.
+#
+# Revision 1.36  2001/10/31 19:26:13  swa
+# automate process of uploading new releases
+# to sf.
+#
+# Revision 1.35  2001/10/15 22:14:59  joergs
+# Removed -O2 and -Wall from AmigaOS-only CFLAGS since they are now in
+#  the general CFLAGS already.
+#
+# Revision 1.34  2001/10/15 18:28:06  steudten
+# remove config.cache for target clobber.
+# Cleanup make dist for RH and S.u.S.E.
+#
+# Revision 1.33  2001/10/10 12:43:33  oes
+# Added ugly hack to make install target work at least for some setups.
+#
+# Revision 1.32  2001/10/09 22:38:19  jongfoster
+# Correcting actionsfile filename for Win32 INI build
+#
+# Revision 1.31  2001/09/23 10:13:48  swa
+# upload process established. run make webserver and
+# the documentation is moved to the webserver. documents
+# are now linked correctly.
+#
 # Revision 1.30  2001/09/19 17:55:49  oes
 # Fixed CFLAGS
 #
@@ -163,7 +189,7 @@ RPM_PACKAGEV  = 1
 # Directories for "make install"
 #############################################################################
 
-DEST        = /etc/junkbuster
+DEST        = @sysconfdir@/junkbuster
 SBIN_DEST   = @sbindir@
 MAN_DEST    = @mandir@
 
@@ -180,7 +206,19 @@ INSTALL    = cp -f
 LD         = @CC@
 RM         = rm -f
 STRIP_PROG = strip
+SED	   = sed
+CAT        = cat
+RPM        = rpm
+MV	   = mv
+TAR        = tar
+MAKE       = make
+
+#############################################################################
+# Setup for make distribution rh and suse for now 
+#############################################################################
 
+TAR_ARCH = /tmp/ijbswa-$(RPM_VERSION).tar.gz
+RPM_BASE = /usr/src/redhat
 
 #############################################################################
 # Filenames and libraries
@@ -287,25 +325,50 @@ junkbstr.txt: config
 			-e 's!#Win32-only: !!' \
 	< $< > $@
 
-sactions.txt: actionslist
+sactions.txt: actionsfile
 strust.txt: trust
 sregexp.txt: re_filterfile
 
 
 #############################################################################
-# redhat distribution
+# redhat distribution alpha and x86
 #############################################################################
 
 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
+	@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; \
+		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; \
+	$(TAR) --exclude "CVS" --exclude "junkbuster-suse.spec" -cvzf $(TAR_ARCH) . ; \
+	$(RPM) -ta  $(TAR_ARCH); \
+	[ -f $(TAR_ARCH) ] && $(RM) $(TAR_ARCH)
+
+#
+# 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
+# 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
+	@$(ECHO) -------------------------------------------------------
+	@$(ECHO) Now goto
+	@$(ECHO) http://sourceforge.net/project/admin/editpackages.php?group_id=11118
+	@$(ECHO) ... and release the files.
+	@$(ECHO) -------------------------------------------------------
+     # w3m http://sourceforge.net/project/admin/editpackages.php?group_id=11118
 
+#############################################################################
+# sun solaris  distribution
+#############################################################################
+solaris-dist:
+	@$(ECHO) coming soon. 
 
 #############################################################################
 # suse distribution (need to be root to build)
@@ -316,16 +379,31 @@ suse-dist:
 # 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' > /tmp/abc && cp -f /tmp/abc junkbuster-suse.spec
+	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/*
+
+#
+# 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
+# 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
+	@$(ECHO) -------------------------------------------------------
+	@$(ECHO) Now goto
+	@$(ECHO) http://sourceforge.net/project/admin/editpackages.php?group_id=11118
+	@$(ECHO) ... and release the files.
+	@$(ECHO) -------------------------------------------------------
 
 # handle with care. use with root.
 suse-clean:
-	rpm -e junkbuster
+	rpm -e junkbuster-suse
 	rm -rf /etc/junkbuster
 	rm -rf /var/log/junkbuster
 	rm -f /etc/init.d/junkbuster
@@ -381,11 +459,11 @@ dok:
 #
 #############################################################################
 webserver:
-	$(ECHO) -------------------------------------------------------
-	$(ECHO) You have run make dok before, right?
-	$(ECHO) Note that this command scps all stuff to the webserver,
-	$(ECHO) it will not remove obsolete documents.
-	$(ECHO) -------------------------------------------------------
+	@$(ECHO) -------------------------------------------------------
+	@$(ECHO) You have run make dok before, right?
+	@$(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 d -exec chmod a+rx {} \;
 	cd doc/webserver && scp -Cr . ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
@@ -444,7 +522,7 @@ w32.res: w32.rc w32res.h icons/ico00001.ico icons/ico00002.ico icons/ico00003.ic
 
 # AmigaOS
 @AMIGAOS_ONLY@OBJS += amiga.o
-@AMIGAOS_ONLY@CFLAGS += -D__AMIGAVERSION__=\"$(VERSION_MAJOR).$(VERSION_MINOR)$(VERSION_POINT)\" -D__AMIGADATE__=\"`date +%d.%m.%Y`\" -W -Wall -m68020 -Os -noixemul -fbaserel -msmall-code
+@AMIGAOS_ONLY@CFLAGS += -D__AMIGAVERSION__=\"$(VERSION_MAJOR).$(VERSION_MINOR)$(VERSION_POINT)\" -D__AMIGADATE__=\"`date +%d.%m.%Y`\" -W -m68020 -noixemul -fbaserel -msmall-code
 @AMIGAOS_ONLY@LDFLAGS += -m68020 -noixemul -fbaserel
 @AMIGAOS_ONLY@LIBS = -lm /gg/lib/libb/libm020/libnix/swapstack.o
 @AMIGAOS_ONLY@amiga.o: amiga.c amiga.h config.h
@@ -457,21 +535,27 @@ clean:
 	$(RM) a.out core $(OBJS) $(W32_FILES) $(W32_INIS)
 
 clobber: clean
-	$(RM) $(PROGRAM) *.pdb *.lib *.exp TAGS junkbuster.log
+	$(RM) $(PROGRAM) *.pdb *.lib *.exp TAGS junkbuster.log config.cache
 
 tags: $(SRCS) $(HDRS)
 	etags $(SRCS) $(HDRS)
 
 install: all
+	#
+	# FIXME: This is a dirty hack to have an install target
+	#        that works at least for some setups. This needs
+	#        to be fixed!
+	#
 	$(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_PROG) -c junkbuster.1 > $(MAN_DEST)/junkbuster.1.gz
-	$(INSTALL) junkbuster.init /sbin/init.d/junkbuster
+	mkdir -p $(DEST)/user-manual
+	mkdir -p $(DEST)/templates
+	cp -r doc/webserver/user-manual $(DEST)
+	cp -r templates $(DEST)
+	$(INSTALL) config actionsfile re_filterfile 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
 
 
 #############################################################################