- Add signal handling (unix)

[privoxy.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 9da03d9..45a4874 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,6 +1,6 @@
 # Note:  Makefile is built automatically from Makefile.in
 #
-# $Id: Makefile.in,v 1.40 2001/12/01 00:24:11 jongfoster Exp $
+# $Id: GNUmakefile.in,v 1.1 2001/12/01 11:22:57 jongfoster Exp $
 #
 # Written by and Copyright (C) 2001 the SourceForge
 # IJBSWA team.  http://ijbswa.sourceforge.net
@@ -27,7 +27,12 @@
 # or write to the Free Software Foundation, Inc., 59
 # Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
-# $Log: Makefile.in,v $
+# $Log: GNUmakefile.in,v $
+# Revision 1.1  2001/12/01 11:22:57  jongfoster
+# Renaming Makefile.in to GNUmakefile.in so that non-GNU versions of
+# make break in a more obvious way.
+# Adding .PHONY section.
+#
 # Revision 1.40  2001/12/01 00:24:11  jongfoster
 # Renaming various config files
 # Fixing CR->CRLF under Win32 (I hope)
@@ -186,7 +191,6 @@
 #
 #
 
-
 #############################################################################
 # Version number (for RPM)
 #############################################################################
@@ -197,7 +201,7 @@ 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
+RPM_PACKAGEV  = 2
 
 
 #############################################################################
@@ -377,6 +381,9 @@ redhat-dist:
        $(CAT) junkbuster-rh.spec | \
                $(SED) 's/^Version:.*/Version: $(RPM_VERSION)/g;s/^Release:.*/Release: $(RPM_PACKAGEV)/g' > abc && \
                $(MV) -f abc junkbuster-rh.spec; \
+       $(CAT) junkbuster.init | \
+               $(SED) 's#JB_PID=.*/\(.*\.pid\).*#JB_PID=@PID_FILE_PATH@/\1#g' > abc && \
+               $(MV) -f abc junkbuster.init; \
        $(TAR) --exclude "CVS" --exclude "junkbuster-suse.spec" -cvzf $(TAR_ARCH) . ; \
        $(RPM) --clean -ta  $(TAR_ARCH); \
        [ -f $(TAR_ARCH) ] && $(RM) $(TAR_ARCH)
@@ -566,7 +573,7 @@ clean:
        $(RM) a.out core $(OBJS) $(W32_FILES) $(W32_INIS)
 
 clobber: clean
-       $(RM) $(PROGRAM) *.pdb *.lib *.exp TAGS junkbuster.log config.cache
+       $(RM) $(PROGRAM) cscope.* logfile *.pdb *.lib *.exp `find . -name tags` TAGS junkbuster.log config.cache
 
 tags: $(SRCS) $(HDRS)
        etags $(SRCS) $(HDRS)