[pastebot-cvs] pastebot MANIFEST,1.3,1.4 MANIFEST.SKIP,1.2,1.3 Makefile,1.5,1.6 pastebot.perl,1.6,1.7

[<rc...@us...>]

Update of /cvsroot/pastebot/pastebot
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21395

Modified Files:
	MANIFEST MANIFEST.SKIP Makefile pastebot.perl 
Log Message:
Cleaned up "make dist" somewhat.  Still needs to build the snapshot
date programmatically, though.

Cleaned up "make install" somewhat.  Removed the need for a separate
pasetbot.lib.sample file.  It's generated by Makefile now.


Index: MANIFEST
===================================================================
RCS file: /cvsroot/pastebot/pastebot/MANIFEST,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MANIFEST	13 Nov 2003 02:44:35 -0000	1.3
--- MANIFEST	8 Sep 2004 15:51:20 -0000	1.4
***************
*** 1,2 ****
--- 1,4 ----
+ # $Id$
+ CHANGES
  COPYRIGHT
  Client/IRC.pm

Index: MANIFEST.SKIP
===================================================================
RCS file: /cvsroot/pastebot/pastebot/MANIFEST.SKIP,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MANIFEST.SKIP	31 Oct 2003 16:49:22 -0000	1.2
--- MANIFEST.SKIP	8 Sep 2004 15:51:20 -0000	1.3
***************
*** 1,12 ****
  \.tar\.gz$
  \bCVS\b
- ~$
- ^pastebot.conf$
- ^pastebot.conf-nopaste$
- /\.#
  ^\.#
! ^MANIFEST\.bak$
! \.swp$
! ^CHANGES$
! \.orig$
  pastestore
--- 1,10 ----
+ /\.#
+ \.bak$
+ \.orig$
+ \.swp$
  \.tar\.gz$
  \bCVS\b
  ^\.#
! pastebot.conf$
  pastestore
+ ~$

Index: Makefile
===================================================================
RCS file: /cvsroot/pastebot/pastebot/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile	8 Sep 2004 15:10:40 -0000	1.5
--- Makefile	8 Sep 2004 15:51:20 -0000	1.6
***************
*** 1,3 ****
! VERSION=20031031
  DISTNAME=pastebot-$(VERSION)
  DISTBUILD=$(DISTNAME)
--- 1,3 ----
! VERSION=20040908
  DISTNAME=pastebot-$(VERSION)
  DISTBUILD=$(DISTNAME)
***************
*** 32,50 ****
  ETCDIR	    = $(sysconfdir)/$(PACKAGE)
  
! TAR_OPT_EX  = --exclude=CVS --exclude=*[~\#] --exclude *.conf *.orig patch.* *.bak
  
  dist: $(DISTTGZ)
  
! $(DISTTGZ): distdir changes
! 	if [ -e $(DISTTGZ) ] ; \
  	  then echo $(DISTTGZ) already exists ; \
  	       exit 1 ; \
  	fi
! 	tar cf $(DISTTAR) $(DISTBUILD)
! 	-perl -MExtUtils::Command -e rm_rf $(DISTBUILD)
! 	gzip $(DISTTAR)
  
  install-cpan:
! 	perl -MCPAN -e '\
  	@list = qw( \
  	HTTP::Request \
--- 32,51 ----
  ETCDIR	    = $(sysconfdir)/$(PACKAGE)
  
! TAR_OPT_EX  = --exclude=CVS --exclude=*[~\#] --exclude *.conf --exclude *.orig --exclude patch.* --exclude *.bak
  
  dist: $(DISTTGZ)
  
! $(DISTTGZ): distdir
! 	@if [ -e $(DISTTGZ) ] ; \
  	  then echo $(DISTTGZ) already exists ; \
  	       exit 1 ; \
  	fi
! 	@tar cf $(DISTTAR) $(DISTBUILD)
! 	@perl -MExtUtils::Command -e rm_rf $(DISTBUILD)
! 	@gzip $(DISTTAR)
  
  install-cpan:
! 	@echo '=== Installing and/or updating CPAN modules...'
! 	@perl -MCPAN -e '\
  	@list = qw( \
  	HTTP::Request \
***************
*** 62,88 ****
  
  install-etc:
  	$(INSTALL) $(INSTALL_BIN) -d $(ETCDIR)
! 	if [ ! -d $(ETCDIR) ]; then exit 1; fi
  	@if [ -f $(ETCDIR)/$(LIBFILE) ]; then \
! 	  echo "Not installing, file exists $(ETCDIR)/$(LIBFILE)"; \
  	else	\
  	  $(INSTALL) $(INSTALL_DATA) $(LIBSRC) $(ETCDIR)/$(LIBFILE); \
  	fi;
  	@if [ -f $(ETCDIR)/$(CONFFILE) ]; then \
! 	  echo "Not installing, file exists $(ETCDIR)/$(CONFFILE)"; \
  	else	\
  	  $(INSTALL) $(INSTALL_DATA) $(CONFSRC) $(ETCDIR)/$(CONFFILE); \
  	fi;
! 	echo "You may need to edit files in $(ETCDIR)"
  
  install-store:
  	$(INSTALL) $(INSTALL_BIN) -d $(PASTEDIR)
  
  install-lib: install-store
  	$(INSTALL) $(INSTALL_BIN) -d $(DATADIR)
! 	if [ ! -d $(DATADIR) ]; then exit 1; fi
! 	tar $(TAR_OPT_EX) -cf - * | (cd $(DATADIR); tar -xf -)
  
  install-bin: 
  	$(INSTALL) $(INSTALL_BIN) -d $(BINDIR)
  	$(INSTALL) $(INSTALL_BIN) $(BINSRC) $(BINDIR)/$(BINFILE)
--- 63,98 ----
  
  install-etc:
+ 	@echo "=== Installing files into $(ETCDIR) ..."
  	$(INSTALL) $(INSTALL_BIN) -d $(ETCDIR)
! 	@if [ ! -d $(ETCDIR) ]; then exit 1; fi
  	@if [ -f $(ETCDIR)/$(LIBFILE) ]; then \
! 	  echo "Not installing, file exists: $(ETCDIR)/$(LIBFILE)"; \
  	else	\
+ 	  echo "use lib '$(ETCDIR)';" > $(LIBSRC); \
+ 	  echo "use lib '$(DATADIR)';" >> $(LIBSRC); \
+ 	  echo "1;" >> $(LIBSRC); \
  	  $(INSTALL) $(INSTALL_DATA) $(LIBSRC) $(ETCDIR)/$(LIBFILE); \
  	fi;
  	@if [ -f $(ETCDIR)/$(CONFFILE) ]; then \
! 	  echo "Not installing, file exists: $(ETCDIR)/$(CONFFILE)"; \
  	else	\
  	  $(INSTALL) $(INSTALL_DATA) $(CONFSRC) $(ETCDIR)/$(CONFFILE); \
  	fi;
! 	@echo "==="
! 	@echo "=== You may need to edit files in $(ETCDIR)"
! 	@echo "==="
  
  install-store:
+ 	@echo "=== Installing pastebot store into $(PASTEDIR) ..."
  	$(INSTALL) $(INSTALL_BIN) -d $(PASTEDIR)
  
  install-lib: install-store
+ 	@echo "=== Installing pastebot library into $(DATADIR) ..."
  	$(INSTALL) $(INSTALL_BIN) -d $(DATADIR)
! 	@if [ ! -d $(DATADIR) ]; then exit 1; fi
! 	@tar $(TAR_OPT_EX) -cf - * | (cd $(DATADIR); tar -xf -)
  
  install-bin: 
+ 	@echo "=== Installing $(BINDIR)/$(BINFILE) ..."
  	$(INSTALL) $(INSTALL_BIN) -d $(BINDIR)
  	$(INSTALL) $(INSTALL_BIN) $(BINSRC) $(BINDIR)/$(BINFILE)
***************
*** 91,110 ****
  
  distdir:
! 	-perl -MExtUtils::Command -e rm_rf $(DISTBUILD)
! 	perl -MExtUtils::Manifest=manicopy,maniread -e "manicopy(maniread(), '$(DISTBUILD)')"
! 	find $(DISTBUILD) -type f | xargs chmod u+w
  
  clean:
! 	-perl -MExtUtils::Command -e rm_rf $(DISTBUILD)
  
  manicheck:
! 	perl -MExtUtils::Manifest=manicheck -e 'manicheck()'
  
  filecheck:
! 	perl -MExtUtils::Manifest=filecheck -e 'filecheck()'
  
  mkmanifest:
! 	perl -MExtUtils::Manifest=mkmanifest -e 'mkmanifest()'
! 
! changes:
! 	cvs-log.perl > CHANGES
--- 101,122 ----
  
  distdir:
! 	cvs-log.perl > CHANGES
! 	@perl -MExtUtils::Command -e rm_rf $(DISTBUILD)
! 	@perl -MExtUtils::Manifest=manicopy,maniread -e "manicopy(maniread(), '$(DISTBUILD)')"
! 	@find $(DISTBUILD) -type f | xargs chmod u+w
  
  clean:
! 	@perl -MExtUtils::Command -e rm_rf $(DISTBUILD) pastebot.lib.sample patch.*
! 	@find . -name '*~' -delete
! 	@find . -name '*.orig' -delete
! 	@find . -name '*.bak' -delete
! 	@find . -name '.*.swp' -delete
  
  manicheck:
! 	@perl -MExtUtils::Manifest=manicheck -e 'manicheck()'
  
  filecheck:
! 	@perl -MExtUtils::Manifest=filecheck -e 'filecheck()'
  
  mkmanifest:
! 	@perl -MExtUtils::Manifest=mkmanifest -e 'mkmanifest()'

Index: pastebot.perl
===================================================================
RCS file: /cvsroot/pastebot/pastebot/pastebot.perl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** pastebot.perl	14 May 2004 06:54:25 -0000	1.6
--- pastebot.perl	8 Sep 2004 15:51:20 -0000	1.7
***************
*** 15,19 ****
  # use  Client::IRC ;
  
- 
  #  The last file overrides. This file can tell where the libraries
  #  by including statement:
--- 15,18 ----