X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=Makefile.in;h=7366bf02710f991103c4aae86a5c789b42044aa9;hb=388e7f59095f7682df50c0ed9fe0fccee66e21ed;hp=551a6d92946ed3625a5e9261d148a478100cd1fa;hpb=f47f78de590c5ae21f7e25c00549e6ed2e3bfabb;p=privoxy.git diff --git a/Makefile.in b/Makefile.in index 551a6d92..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.34 2001/10/15 18:28:06 steudten 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,17 @@ # 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. @@ -178,7 +189,7 @@ RPM_PACKAGEV = 1 # Directories for "make install" ############################################################################# -DEST = /etc/junkbuster +DEST = @sysconfdir@/junkbuster SBIN_DEST = @sbindir@ MAN_DEST = @mandir@ @@ -195,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 @@ -308,19 +331,44 @@ 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' > abc && mv -f 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) @@ -337,10 +385,25 @@ suse-dist: # 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 @@ -396,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/