ncurses 6.1 - patch 20190921

[ncurses.git] / Ada95 / gen / Makefile.in

diff --git a/Ada95/gen/Makefile.in b/Ada95/gen/Makefile.in
index c900217c725c0f2ed50fcf00bd997cb0a78898fe..4e649d1c36e0b32b8cffbd309951d0dcea24c492 100644 (file)
--- a/Ada95/gen/Makefile.in
+++ b/Ada95/gen/Makefile.in
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.                #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
@@ -28,11 +28,11 @@
 #
 #  Author:  Juergen Pfeifer, 1996
 #
-#  $Id: Makefile.in,v 1.83 2015/04/26 15:49:35 tom Exp $
+#  $Id: Makefile.in,v 1.89 2019/08/31 15:44:14 tom Exp $
 #
 .SUFFIXES:
 
-SHELL          = /bin/sh
+SHELL          = @SHELL@
 VPATH          = @srcdir@
 THIS           = Makefile
 
@@ -46,8 +46,8 @@ exec_prefix   = @exec_prefix@
 bindir         = @bindir@
 includedir     = @includedir@
 
-INSTALL                = @INSTALL@
-INSTALL_PROG   = @INSTALL_PROGRAM@
+INSTALL                = @INSTALL@ @INSTALL_OPT_O@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_DATA   = @INSTALL_DATA@
 
 AWK            = @AWK@
@@ -76,12 +76,17 @@ ABI_VERSION = @cf_cv_abi_version@
 LOCAL_LIBDIR   = @top_builddir@/lib
 
 LINK           = $(HOST_CC)
-
 LDFLAGS                = @LDFLAGS@
-HOST_LDFLAGS   = @BUILD_LDFLAGS@
-
 LIBS           = @LIBS@
-HOST_LIBS      = @BUILD_LIBS@
+
+# For the wide-character configuration combined with broken_linker, we need
+# addresses of ACS_xxx constants, which requires linking with the newly built
+# ncurses library.  If cross-compiling, the developer has to fill in a workable
+# native library for this purpose.
+NATIVE_LDFLAGS = @LD_MODEL@ $(LOCAL_LIBS) @TINFO_LDFLAGS2@ $(LDFLAGS) @LIBS@ @LOCAL_LDFLAGS2@ $(LDFLAGS) @TINFO_LIBS@
+CROSS_LDFLAGS  = @BUILD_LDFLAGS@ @BUILD_LIBS@
+
+ACTUAL_LDFLAGS = @ADAGEN_LDFLAGS@
 
 RANLIB         = @RANLIB@
 
@@ -93,7 +98,7 @@ ADACURSES_CONFIG = adacurses@USE_CFG_SUFFIX@-config
 WRAPPER                = @NCURSES_SHLIB2@
 
 PROG_GENERATE  = ./generate$x
-GENERATE       = $(PROG_GENERATE) '@DFT_ARG_SUFFIX@'
+GENERATE       = $(PROG_GENERATE) '@USE_ARG_SUFFIX@'
 DEL_ADAMODE    = sed -e '/^\-\-\ \ \-\*\-\ ada\ \-\*\-.*/d'
 
 GNATHTML       = `type -p gnathtml || type -p gnathtml.pl 2>/dev/null`
@@ -148,14 +153,14 @@ $(DESTDIR)$(bindir) :
 
 install \
 install.libs :: $(DESTDIR)$(bindir) $(ADACURSES_CONFIG)
-       $(INSTALL_PROG) $(ADACURSES_CONFIG) $(DESTDIR)$(bindir)/$(ADACURSES_CONFIG)
+       $(INSTALL_SCRIPT) $(ADACURSES_CONFIG) $(DESTDIR)$(bindir)/$(ADACURSES_CONFIG)
 
 uninstall \
 uninstall.libs ::
        -rm -f $(DESTDIR)$(bindir)/$(ADACURSES_CONFIG)
 
 $(PROG_GENERATE):  gen.o
-       @ECHO_LD@ $(LINK) $(CFLAGS_NORMAL) gen.o $(HOST_LDFLAGS) $(HOST_LIBS) -o $@
+       @ECHO_LD@ $(LINK) $(CFLAGS_NORMAL) gen.o $(ACTUAL_LDFLAGS) -o $@
 
 gen.o: $(srcdir)/gen.c
        $(HOST_CC) $(CFLAGS_NORMAL) -c -o $@ $(srcdir)/gen.c
@@ -324,6 +329,8 @@ adahtml:
           sed -e 's%GNAT%<A HREF="http://$(GNATHP)">GNAT</A>%g' |\
           sed -e 's%&lt;A HREF%<A HREF%g' |\
           sed -e 's%"&gt;%">%g' |\
+          sed -e 's%#1A\([[:space:]]*NAME="[^"]*"\)#2%<A\1>%' |\
+          sed -e 's%#1/A#2%</A>%' |\
           sed -e 's/3X/3x/g' |\
           sed -e 's/$$\([ABCDEFGHIJKLMNOPQRSTUVWXZabcdefghijklmnopqrstuvwxz0123456789_]*:.*\)\$$/@\1@/' |\
           sed -e 's%&lt;/A&gt;%</A>%g' > $$a.tmp ;\