From: Paul Eggert Date: Thu, 17 Jul 2014 20:08:36 +0000 (-0700) Subject: build: port to non-GNU make X-Git-Tag: v8.23~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6202fcb99acaeda1fa7349ea7a4e11617608f498;p=thirdparty%2Fcoreutils.git build: port to non-GNU make This fixes a problem with native Solaris 'make', which does not grok '-include' lines (a GNU extension to POSIX 'make'). * configure.ac (man/dynamic-deps.mk): Create it, with an old time stamp, if doing dynamic dependency tracking. * man/local.mk (DISTCLEANFILES): Put man/dynamic-deps.mk here, rather than in CLEANFILES. (man/dynamic-deps.mk): Don't create it read-only, so that we can easily touch it later. Include it with '@AMDEP_TRUE@@am__include@', not with '-include', as '-include' does not work with native Solaris 'make'. --- diff --git a/configure.ac b/configure.ac index b50f6e14c0..ae78cb1877 100644 --- a/configure.ac +++ b/configure.ac @@ -587,6 +587,15 @@ AM_GNU_GETTEXT_VERSION([0.18.1]) # For a test of uniq: it uses the $LOCALE_FR envvar. gt_LOCALE_FR +# If doing dynamic dependency checking, create man/dynamic-deps.mk so +# that 'make' doesn't complain about its being absent. Use an old +# time stamp, so that 'make' thinks it is older than 'Makefile'. +# Use time stamp 1, since some 'make' implementations treat 0 specially. +# Use 'touch -t', since older 'touch' implementations don't grok -d. +AC_CONFIG_COMMANDS([man/dynamic-deps.mk], + [test -n "$AMDEP_TRUE" || + TZ=UTC0 touch -t 197001010000.01 man/dynamic-deps.mk]) + AC_CONFIG_FILES( Makefile po/Makefile.in diff --git a/man/local.mk b/man/local.mk index a4117b110e..f4b213f7e8 100644 --- a/man/local.mk +++ b/man/local.mk @@ -57,7 +57,7 @@ $(ALL_MANS): $(mandeps) # are handled by converting $name to $prog on the following code. # $(ALL_MANS) includes the $(EXTRA_MANS) so even the programs that are not # being installed will have the right dependency for the manpages. -CLEANFILES += man/dynamic-deps.mk +DISTCLEANFILES += man/dynamic-deps.mk man/dynamic-deps.mk: Makefile $(AM_V_GEN)rm -f $@ $@-t $(AM_V_at)for man in $(ALL_MANS); do \ @@ -75,11 +75,10 @@ man/dynamic-deps.mk: Makefile echo $$man: src/$$prog$(EXEEXT);; \ esac \ done > $@-t \ - && chmod a-w $@-t \ && mv $@-t $@ # Include the generated man dependencies. --include man/dynamic-deps.mk +@AMDEP_TRUE@@am__include@ man/dynamic-deps.mk .x.1: $(AM_V_GEN)name=`echo $@ | sed 's|.*/||; s|\.1$$||'` || exit 1; \