[lmi-commits] [4971] Fix date calculations

[Greg Chicares]

Revision: 4971
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=4971
Author:   chicares
Date:     2010-06-01 20:05:23 +0000 (Tue, 01 Jun 2010)
Log Message:
-----------
Fix date calculations

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/workhorse.make

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2010-06-01 20:04:35 UTC (rev 4970)
+++ lmi/trunk/ChangeLog 2010-06-01 20:05:23 UTC (rev 4971)
@@ -25889,3 +25889,24 @@
   dbdict.cpp
 Write only leaf elements to xml, excluding GUI topic nodes.
 
+20100531T1605Z <address@hidden> [704]
+
+  dbdict.cpp
+Accommodate GUI product editor.
+
+20100531T2342Z <address@hidden> [704]
+
+  dbdict.cpp
+Remove old markup; rearrange.
+
+20100601T2004Z <address@hidden> [704]
+
+  authenticity.cpp
+Clarify diagnostics.
+
+20100601T2005Z <address@hidden> [704]
+
+  workhorse.make
+Fix date calculations. See:
+  http://lists.nongnu.org/archive/html/lmi/2010-06/msg00001.html
+

Modified: lmi/trunk/workhorse.make
===================================================================
--- lmi/trunk/workhorse.make    2010-06-01 20:04:35 UTC (rev 4970)
+++ lmi/trunk/workhorse.make    2010-06-01 20:05:23 UTC (rev 4971)
@@ -919,18 +919,15 @@
 fardel_name := lmi-$(yyyymmddhhmm)
 fardel_dir  := $(prefix)/$(fardel_name)
 
-# The first value assigned to 'd1' shows one possibility for the
-# beginning date. It's deliberately overridden with another that sets
-# the beginning date to the current date. The obvious y2038 problem is
-# ignored because any breakage it causes will be obvious.
+# The obvious y2038 problem is ignored because any breakage it causes
+# will be, well, obvious.
 
 fardel_date_script := \
   d0=`$(DATE) +%Y-%m-01`; \
-  d1=`$(DATE) --utc --date="$$d0 + 1 month         " +%s`; \
-  d1=`$(DATE) --utc +%s`; \
-  d2=`$(DATE) --utc --date="$$d0 + 2 months - 1 day" +%s`; \
-  j1=`expr 2440587 + $$d1 / 86400`; \
-  j2=`expr 2440587 + $$d2 / 86400`; \
+  d1=`$(DATE) --utc --date="$$d0 + 1 month " +%s`; \
+  d2=`$(DATE) --utc --date="$$d0 + 2 months" +%s`; \
+  j1=`expr 2440588 + $$d1 / 86400`; \
+  j2=`expr 2440588 + $$d2 / 86400`; \
   echo -n "$$j1 $$j2" >expiry; \
 
 # Several shared libraries are required by lmi, but there seems to be