Re: [bug-gawk] Proposition of a DJGPP specific patch.

[Juan Manuel Guerrero]

Am 01.07.2017 18:31, schrieb Eli Zaretskii:

[snip]
> There seems to be some snafu here: the first part of the diffs is
> followed by the text of your email.  Please resend the patch without
> these problems.

I do not know what has happened here.  I have made a new patch against HEAD
and attached it as gziped file.  I can send it as plain text if required.


[snip]
> > diff -aprNU5 gawk-4.1.4.orig/pc/Makefile gawk-4.1.4/pc/Makefile
> > --- gawk-4.1.4.orig/pc/Makefile 2016-05-30 20:10:06 +0000
> > +++ gawk-4.1.4/pc/Makefile      2017-06-23 23:09:56 +0000
> > @@ -79,11 +79,14 @@ MAK = $(MAKE) $(MAKEFILE)
> >    #prefix =
> >    prefix = c:/gnu
> >    pkgdatadir = $(prefix)/lib/awk
> >    pkgextensiondir = $(prefix)/lib/gawk
> >    DEFLIBPATH = "\"$(pkgextensiondir)\""
> > +LOCALEDIR="\"$(prefix)/share/locale\""
> >    SHLIBEXT = "\"dll\""
> > +infodir = $(prefix)/info
> > +mandir = $(prefix)/share/man
> >    #
> >    # Define the install method. Method 1 is Unix-like (and requires cat
> >    # and cp); method 2 uses gawk and batch files.
> >    install = 1
> >    #------------------------------------------------------------------------
> > @@ -98,12 +101,18 @@ DO_BIND= $($(BIND))
> >    #========================================================================
> >    #========================== DJGPP =======================================
> >    #========================================================================
> >
> >    ifneq ($(DJGPP),)
> > -prefix = $(DJDIR)
> > +prefix = /dev/env/DJDIR
> >    pkgdatadir = $(prefix)/share/awk
> > +pkgextensiondir = $(prefix)/lib/gawk
> > +DEFLIBPATH = "\"$(pkgextensiondir)\""
> > +LOCALEDIR="\"$(prefix)/share/locale\""
> > +SHLIBEXT = "\"dxe\""
> > +infodir = $(prefix)/share/info
> > +mandir = $(prefix)/share/man
>
> Why did you need to add some of these lines twice: once in the DJGPP
> part, the other in the common part?

Yes, I have missed something here.  The new patch has been fixed accordingly.


> > @@ -286,12 +295,12 @@ install1:
> >         -mkdir "$(prefix)"
> >         -mkdir "$(prefix)/bin"
> >         -mkdir "$(prefix)/share"
> >         -mkdir "$(prefix)/share/man"
> >         -mkdir "$(pkgdatadir)" "$(prefix)/share/man/man1" "$(prefix)/share/info"
> > -       cp *awk.exe igawk.bat igawk.cmd pc/awklib/igawk $(prefix)/bin
> >         cp gawk.exe $(prefix)/bin/awk.exe
> > +       cp *awk.exe igawk.bat igawk.cmd pc/awklib/igawk $(prefix)/bin
>
> This seems to be a change of order of 2 lines?  Why is this needed?

I have been using adaptions of this patch since a lot of years to produce the
binaries uploaded to ftp.delorie.com and there has been some good reason to do
so but unfortunately I have forgotten why.  To avoid inconveniences I have
removed that hunck.


Regards,
Juan M. Guerrero

djgpp.patch.gz
Description: GNU Zip compressed data