From 20a8a8a9422d4f9554ced669c30fbf06d5a93218 Mon Sep 17 00:00:00 2001 From: jongfoster Date: Sat, 1 Dec 2001 00:24:11 +0000 Subject: [PATCH] Renaming various config files Fixing CR->CRLF under Win32 (I hope) --- Makefile.in | 48 ++++++++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/Makefile.in b/Makefile.in index 84c55cb8..803883ac 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,6 @@ # Note: Makefile is built automatically from Makefile.in # -# $Id: Makefile.in,v 1.38 2001/11/05 21:35:23 steudten Exp $ +# $Id: Makefile.in,v 1.39 2001/11/06 12:07:30 steudten Exp $ # # Written by and Copyright (C) 2001 the SourceForge # IJBSWA team. http://ijbswa.sourceforge.net @@ -28,6 +28,9 @@ # Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # $Log: Makefile.in,v $ +# Revision 1.39 2001/11/06 12:07:30 steudten +# Add --clean for building rpm in target redhat-dist. +# # Revision 1.38 2001/11/05 21:35:23 steudten # Complete rewrite for the 'redhat-dist' target. # Checks for writeable RPM build directories for calling user. @@ -221,6 +224,15 @@ MV = mv TAR = tar MAKE = make +# Program to do LF->CRLF +# +# The sed version should be the most portable, but it doesn't for for me, +# the other two do. FIXME. +# - Jon +#DOSFILTER = $(SED) -e $$'s,$$,\r,' +#DOSFILTER = gawk -v ORS='\r\n' '{print $0;}' +DOSFILTER = perl -p -e 's/\n/\r\n/' + ############################################################################# # Setup for make distribution rh and suse for now ############################################################################# @@ -244,7 +256,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@junkbstr.txt sactions.txt strust.txt sregexp.txt +W32_INIS = @WIN_ONLY@config.txt trust.txt re_filterfile.txt PCRS_SRC = @STATIC_PCRS_ONLY@pcrs.c PCRS_OBJS = @STATIC_PCRS_ONLY@$(PCRS_SRC:.c=.@OBJEXT@) @@ -318,24 +330,24 @@ all: $(PROGRAM) # Win32 config files ############################################################################# -%.txt: - sed -e $$'s,$$,\r,' < $< > $@ - inifiles: $(W32_INIS) -junkbstr.txt: config - sed -e 's!\actionsfile!sactions.txt!' \ - -e 's!\trust!strust.txt!' \ - -e 's!\jarfile!jar.log!' \ - -e 's!\logfile!junkbstr.log!' \ - -e 's!\re_filterfile!sregexp.txt!' \ - -e $$'s,$$,\r,' \ - -e 's!#Win32-only: !!' \ - < $< > $@ +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 + +trust.txt: trust + $(DOSFILTER) < $< > $@ -sactions.txt: actionsfile -strust.txt: trust -sregexp.txt: re_filterfile +re_filterfile.txt: re_filterfile + $(DOSFILTER) < $< > $@ ############################################################################# @@ -560,7 +572,7 @@ install: all mkdir -p $(DEST)/templates cp -r doc/webserver/user-manual $(DEST) cp -r templates $(DEST) - $(INSTALL) config actionsfile re_filterfile trust $(DEST) + $(INSTALL) config ijb.action 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 -- 2.39.2