Alexey Kopytov has proposed merging lp:~akopytov/dvc/bug386779 into lp:dvc.
Requested reviews:
dvc-dev (dvc-dev)
Related bugs:
#386779 make fails on OS X at "date" call
https://bugs.launchpad.net/bugs/386779
--
https://code.launchpad.net/~akopytov/dvc/bug386779/+merge/42750
Your team dvc-dev is requested to review the proposed merge of
lp:~akopytov/dvc/bug386779 into lp:dvc.
=== modified file 'configure.ac'
--- configure.ac 2010-06-06 14:13:58 +0000
+++ configure.ac 2010-12-04 21:06:07 +0000
@@ -56,6 +56,7 @@
# Common system utilities checking:
AC_PROG_MAKE_SET
AC_PROG_INSTALL
+AC_PROG_MKDIR_P
# External programs checking:
@@ -170,6 +171,15 @@
AC_MSG_WARN([*** if tree-widget.el is already present on your system])
fi
+AC_MSG_CHECKING([for the date utility flavor])
+if date --version 2>/dev/null | grep GNU ; then
+ DATE_FLAVOR="GNU"
+else
+ DATE_FLAVOR="BSD"
+fi
+AC_MSG_RESULT([${DATE_FLAVOR}])
+AC_SUBST([DATE_FLAVOR])
+
AC_OUTPUT
# configure.ac ends here
=== modified file 'texinfo/Makefile.in'
--- texinfo/Makefile.in 2010-09-11 18:02:35 +0000
+++ texinfo/Makefile.in 2010-12-04 21:06:07 +0000
@@ -17,6 +17,7 @@
datarootdir = @datarootdir@
prefix = @prefix@
info_dir = @info_dir@
+DATE_FLAVOR = @DATE_FLAVOR@
##############################################################################
all: info dvc.dvi dvc.html dvc.pdf
@@ -81,8 +82,18 @@
dvc-version.texinfo: $(top_srcdir)/configure
@echo Creating $@
- @( echo @set VERSION $(PACKAGE_VERSION) ; \
- date '+...@set UPDATED %F' -r $< ) > $@
+ @if test "${DATE_FLAVOR}" = "GNU"; then \
+ ( echo @set VERSION $(PACKAGE_VERSION) ; \
+ date '+...@set UPDATED %F' -r $< ) > $@ ; \
+ elif test "${DATE_FLAVOR}" = "BSD"; then \
+ ( echo @set VERSION $(PACKAGE_VERSION) ; \
+ stat -t'%F' -f'@set UPDATED %Sm' $< ) > $@; \
+ else \
+ echo "Uknown date flavor: ${DATE_FLAVOR}"; \
+ false; \
+ fi
+
+
.PHONY: all dvi pdf html info \
install uninstall \
_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev
