Fix FTBFS when HAVE_BROKEN_RTC defined.

tweak portable get-cwd trick code to work on GNU-make 3.82
2026-11-06 15:51:41 +00:00 · 2012-02-29 21:43:37 +00:00 · 2012-02-29 21:37:14 +00:00
2 changed files with 5 additions and 4 deletions
@@ -46,10 +46,10 @@ MAN = man

 #################################################################

-# pmake way.
-top != pwd
+# pmake way. (NB no spaces to keep gmake 3.82 happy)
+top!=pwd
 # GNU make way.
-top ?= $(shell pwd)
+top?=$(CURDIR)

 dbus_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DBUS $(PKG_CONFIG) --cflags dbus-1` 
 dbus_libs =   `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DBUS $(PKG_CONFIG) --libs dbus-1` 
@@ -614,7 +614,8 @@ void lease_set_expires(struct dhcp_lease *lease, unsigned int len, time_t now)
  if (len != lease->length)
    {
      lease->length = len;
-      lease->aux_changed = file_dirty = 1; 
+      lease->flags |= LEASE_AUX_CHANGED;
+      file_dirty = 1; 
    }
 #endif
 }
Author	SHA1	Message	Date
Simon Kelley	b7f4020133	Fix FTBFS when HAVE_BROKEN_RTC defined.	2012-02-29 21:43:37 +00:00
Simon Kelley	c46c7c7584	tweak portable get-cwd trick code to work on GNU-make 3.82	2012-02-29 21:37:14 +00:00