emacs/lispref/Makefile.in: Minor fix for MS Win port

emacs/lispref/Makefile.in: Minor fix for MS Win port

[dhruva]

Hello,
 I had sent a mail with this fix but my mail server went off. I am not
 sure whether the mail was sent. Incase it is duplicated, my apologies.

 In emacs/lispref/Makefile.in, a call to 'ln -s' is done on 'index.texi.
The MinGW/Win32 port of 'ln' creates a symbolic link with a '.lnk'
extension. Hence, "ln -s index.perm index.texi" results in a file
"index.texi.lnk" instead of "index.texi". This causes a build failure for
emacs/lispref. I have made a trivial modification.

with regards,
dhruva

[dky]diff -burN D:\tmp\cvs\emacs\emacs\lispref\Makefile.in Makefile.in
--- D:\tmp\cvs\emacs\emacs\lispref\Makefile.in  2003-08-13
19:45:11.000000000 +0530
+++ Makefile.in 2003-08-20 09:51:04.000000000 +0530
@@ -135,6 +135,11 @@
        else \
          ln -s $(srcdir)/index.unperm index.texi || ln
          $(srcdir)/index.unperm index.texi || cp $(srcdir)/index.unperm
          index.texi; \
        fi
+       # For MS port of ln
+       if [ -f index.texi.lnk ]; \
+       then \
+         mv index.texi.lnk index.texi; \
+       fi

 install: elisp
        $(srcdir)/mkinstalldirs $(infodir)
-- 
Dhruva Krishnamurthy
Web: http://schemer.fateback.com/

emacs/lispref/Makefile.in: Minor fix for MS Win port

[dhruva]

Hello,
 The Makefile.in in emacs/lispref has a small problem on MS Windows port.
 If it finds 'ln', it uses it and created a symbolic link to the original
 file BUT with a ".lnk" extension.

For ex:
 ln -s index.texi creates "index.texi.lnk"

I am sending a small patch to handle this in Makefile.in. Maybe crude,
but works! If you find this good enough, someone can install it. I have
no write access to CVS.

cmd I used (first file is from CVS, second file is modified file):
diff -p D:\tmp\cvs\emacs\emacs\lispref\Makefile.in Makefile.in

*** D:\tmp\cvs\emacs\emacs\lispref\Makefile.in  Wed Aug 13 19:45:11 2003
--- Makefile.in Wed Aug 20 09:51:04 2003
*************** index.texi:
*** 135,140 ****
--- 135,145 ----
        else \
          ln -s $(srcdir)/index.unperm index.texi || ln
          $(srcdir)/index.unperm index.texi || cp $(srcdir)/index.unperm
          index.texi; \
        fi
+       # For MS port of ln
+       if [ -f index.texi.lnk ]; \
+       then \
+         mv index.texi.lnk index.texi; \
+       fi

  install: elisp
        $(srcdir)/mkinstalldirs $(infodir)
-- 
Dhruva Krishnamurthy
Web: http://schemer.fateback.com/

Re: emacs/lispref/Makefile.in: Minor fix for MS Win port

[Jason Rumney]

dhruva wrote:
> Hello,
>  The Makefile.in in emacs/lispref has a small problem on MS Windows port.

The MS-Windows port does not use Makefile.in, I am surprised you got it 
working this far.

>  If it finds 'ln', it uses it and created a symbolic link to the original
>  file BUT with a ".lnk" extension.

That is correct for Cygwin I think. Does renaming the file actually 
work? Because Windows shortcuts (the equivalent of symbolic links) use 
the file extension to identify themselves, I think renaming it would 
prevent the shortcut from being recognised as such.

It would be better to write a Makefile-w32.in that takes care of the 
vast differences between Windows and Unix. Someone is already doing that 
for emacs/man, so that could be used as a template once it is ready.

Re: emacs/lispref/Makefile.in: Minor fix for MS Win port

[dhruva]

On Fri, 22 Aug 2003 10:12:46 +0100, "Jason Rumney" <jasonr@gnu.org> said:
> >  If it finds 'ln', it uses it and created a symbolic link to the original
> >  file BUT with a ".lnk" extension.
> 
> That is correct for Cygwin I think. Does renaming the file actually 
> work? Because Windows shortcuts (the equivalent of symbolic links) use 
> the file extension to identify themselves, I think renaming it would 
> prevent the shortcut from being recognised as such.

[dky]file --version
file-3.41
magic file from d:/MinGW32/share/magic

[dky]file index.texi
index.texi: ms-Windows shortcut

It does recognise the link after renaming as a shortcut even without the
'.lnk' extension.

with regards,
dhruva
-- 
Dhruva Krishnamurthy
Web: http://schemer.fateback.com/

Re: emacs/lispref/Makefile.in: Minor fix for MS Win port

[Peter 'Luna' Runestig]

On 2003-08-22 11:12, Jason Rumney wrote:
> It would be better to write a Makefile-w32.in that takes care of the 
> vast differences between Windows and Unix. Someone is already doing that 
> for emacs/man, so that could be used as a template once it is ready.

lispref/makefile.w32-in is in my "nmake info" patch.

-- 
Peter 'Luna' Runestig (fd. Altberg), Sweden <peter@runestig.com>
PGP Key ID: 0xD07BBE13
Fingerprint: 7B5C 1F48 2997 C061 DE4B  42EA CB99 A35C D07B BE13
AOL Instant Messenger Screen name: PRunestig
Yahoo! Messenger profile name: altberg