log: Eliminate potential out-of-control recursion

[secnet.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 51106a3de29a630c08dcae67fafb85d684477734..182204b4b791dfcd92453430052567b9cb203ae9 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,7 +18,7 @@
 .PHONY:        all clean realclean distclean dist install
 
 PACKAGE:=secnet
-VERSION:=0.1.18
+VERSION:=0.2.1
 
 @SET_MAKE@
 
@@ -38,10 +38,10 @@ CFLAGS:=-Wall @WRITESTRINGS@ @CFLAGS@ -Werror \
        -Wpointer-arith -Wformat=2 -Winit-self \
        -Wswitch-enum -Wunused-variable -Wbad-function-cast \
        -Wno-strict-aliasing -fno-strict-aliasing
-ALL_CFLAGS:=@DEFS@ -I$(srcdir) -I. $(CFLAGS)
-CPPFLAGS:=@CPPFLAGS@
-LDFLAGS:=@LDFLAGS@
-LDLIBS:=@LIBS@
+ALL_CFLAGS:=@DEFS@ -I$(srcdir) -I. $(CFLAGS) $(EXTRA_CFLAGS)
+CPPFLAGS:=@CPPFLAGS@ $(EXTRA_CPPFLAGS)
+LDFLAGS:=@LDFLAGS@ $(EXTRA_LDFLAGS)
+LDLIBS:=@LIBS@ $(EXTRA_LDLIBS)
 
 prefix:=@prefix@
 exec_prefix:=@exec_prefix@
@@ -148,7 +148,8 @@ dist:
 # Release checklist:
 #  1. Check that the tree has what you want
 #
-#  2. Update VERSION above but DO NOT COMMIT
+#  2. Update VERSION (above) and debian/changelog
+#     but DO NOT COMMIT
 #
 #  3. Run
 #       ./configure
@@ -156,15 +157,29 @@ dist:
 #     and check that the resulting tarball looks OK.
 #     Eg, untar it and build it, or have it reviewed.
 #
-#  3. Commit the update to VERSION
+#  3. Commit the updates to VERSION (above) and debian/changelog
 #
 #  4. git-tag -s v$(VERSION)
 #
 #  5. git-push origin
 #
-#  6. gpg --detach-sign ../secnet-$(VERSION).tar.gz
+#  6. Run, again,
+#       make dist
+#
+#  7. gpg --detach-sign ../secnet-$(VERSION).tar.gz
 #
-#  7. rsync -v ../secnet-$VERSION.tar.gz* \
+#  8. rsync -v ../secnet-$VERSION.tar.gz* \
 #        chiark:/home/ianmdlvl/public-html/secnet/download/
 #
-#  8. write and post a release announcement
+#  9. On chiark:
+#       tar zxf ~ianmdlvl/public-html/secnet/download/secnet-$(VERSION).tar.gz
+#       cd secnet-$(VERSION)
+#       debian/rules build
+#       fakeroot debian/rules binary
+#       mv ../secnet_0.1.18.1-1_i386.deb ~/public-html/secnet/download/
+#
+#  10. On chiark as user secnet:
+#       cd ~secnet/
+#       rsync ~ianmdlvl/public-html/secnet/download/secnet* .
+#
+#  11. write and post a release announcement