diff nt/config.inc.samp @ 5933:c1e8f3294298 cygwin

revert timeval comment, backed out change to winsock.h and just lots of warnings??? Also updated config.inc.samp to reflect a way to work around lack of windows-runnable hg
author Henry Thompson <ht@markup.co.uk>
date Thu, 10 Dec 2015 17:55:59 +0000
parents 2b2f37e84792
children
line wrap: on
line diff
--- a/nt/config.inc.samp	Wed Dec 09 15:50:11 2015 +0000
+++ b/nt/config.inc.samp	Thu Dec 10 17:55:59 2015 +0000
@@ -175,7 +175,13 @@
 # Cygwin sitting around already.  If not, you should.  Cygwin provides a
 # `makeinfo.exe' in /usr/bin/makeinfo (/usr/bin is virtual, it's /bin in
 # the actual file system).
-MAKEINFO=c:\cygwin\bin\makeinfo.exe
+# MAKEINFO=c:\[cygwin]\bin\makeinfo
+
+# Set this to specify the location of a Windows-compatible hg.
+# The default will not include any hg version info in the emacs-version string
+# You can use $(MAKEDIR)\hg.bat if you have cygwin versions of python2.7 and hg,
+# for other versions edit hg.bat
+HG=hg
 
 # Set this to enable debug code in XEmacs that doesn't slow things down,
 # and to add debugging information to the executable. (The code that's