ncurses 6.0 - patch 20170318

[ncurses.git] / ncurses / Makefile.in

diff --git a/ncurses/Makefile.in b/ncurses/Makefile.in
index e42c5e3b271ecf13be2f0ad526f1c4496f21beea..d761af1d5d7447a2af3988eea3a3d313636c3226 100644 (file)
--- a/ncurses/Makefile.in
+++ b/ncurses/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.147 2015/08/05 23:15:41 tom Exp $
+# $Id: Makefile.in,v 1.152 2016/06/25 21:13:06 tom Exp $
 ##############################################################################
-# Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2015,2016 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"), #
@@ -101,7 +101,7 @@ CPP         = @CPP@
 CFLAGS         = @CFLAGS@
 
 INCDIR         = $(srcdir)/../include
-CPPFLAGS       = -DHAVE_CONFIG_H @CPPFLAGS@
+CPPFLAGS       = -DHAVE_CONFIG_H -I../ncurses @CPPFLAGS@
 
 CCFLAGS                = $(CPPFLAGS) $(CFLAGS)
 
@@ -196,6 +196,8 @@ TEST_PROGS = \
        hashmap$x \
        lib_mvcur$x
 
+LOCAL_LIBDIR   = @top_builddir@/lib
+
 base    = $(srcdir)/base
 serial  = $(srcdir)/tty
 tinfo   = $(srcdir)/tinfo
@@ -225,7 +227,7 @@ init_keytry.h: make_keys$(BUILD_EXEEXT) keys.list
        ./make_keys$(BUILD_EXEEXT) keys.list > $@
 
 keys.list :    $(tinfo)/MKkeys_list.sh
-       AWK=$(AWK) $(SHELL) $(tinfo)/MKkeys_list.sh $(TERMINFO_CAPS) | sort >$@
+       AWK=$(AWK) $(SHELL) $(tinfo)/MKkeys_list.sh $(TERMINFO_CAPS) | LC_ALL=C sort >$@
 
 make_keys$(BUILD_EXEEXT) : \
                $(tinfo)/make_keys.c \
@@ -266,7 +268,8 @@ tags:
 @MAKE_UPPER_TAGS@      $(ETAGS) *.[ch] */*.[ch]
 
 mostlyclean ::
-       -rm -f core tags TAGS *~ *.bak *.i *.ln *.atac trace
+       -rm -f core tags TAGS *~ *.bak *.i *.ln *.atac
+       -test -d trace || rm -f trace
        -rm -f $(TEST_PROGS)
 
 clean :: mostlyclean