ncurses 5.9 - patch 20130805

[ncurses.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 35db7434a3be02e3ed8811ce3a9638091999ad92..a68a946ed3edea05ba00798243eb7a781b196e6b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.32 2012/01/07 20:10:29 juergen Exp $
+# $Id: Makefile.in,v 1.36 2013/08/03 22:58:52 tom Exp $

 ##############################################################################
 ##############################################################################

-# Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2011,2012 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"), #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #


@@ -36,7 +36,7 @@ VPATH         = @srcdir@
 
 DESTDIR=@DESTDIR@
 RPATH_LIST=@RPATH_LIST@
 
 DESTDIR=@DESTDIR@
 RPATH_LIST=@RPATH_LIST@

-CF_MFLAGS = @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" RPATH_LIST="$(RPATH_LIST)"
+TOP_MFLAGS = @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" RPATH_LIST="$(RPATH_LIST)"

 
 @SET_MAKE@
 
 
 @SET_MAKE@
 


@@ -49,13 +49,17 @@ srcdir              = @srcdir@
 
 prefix         = @prefix@
 exec_prefix    = @exec_prefix@
 
 prefix         = @prefix@
 exec_prefix    = @exec_prefix@

+datarootdir    = @datarootdir@

 
 bindir         = @bindir@
 ticdir         = @TERMINFO@
 includedir     = @includedir@
 
 bindir         = @bindir@
 ticdir         = @TERMINFO@
 includedir     = @includedir@

+includesubdir  = @includesubdir@

 libdir         = @libdir@
 mandir         = @mandir@
 
 libdir         = @libdir@
 mandir         = @mandir@
 

+INCLUDEDIR     = ${DESTDIR}${includedir}${includesubdir}
+

 INSTALL                = @INSTALL@
 INSTALL_DATA   = @INSTALL_DATA@
 
 INSTALL                = @INSTALL@
 INSTALL_DATA   = @INSTALL_DATA@
 


@@ -75,17 +79,17 @@ preinstall :
        @ echo ''
        @ echo '      bin directory: '$(bindir)
        @ echo '      lib directory: '$(libdir)
        @ echo ''
        @ echo '      bin directory: '$(bindir)
        @ echo '      lib directory: '$(libdir)

-       @ echo '  include directory: '$(includedir)
+       @ echo '  include directory: '$(INCLUDEDIR)

        @ echo '      man directory: '$(mandir)
 @MAKE_TERMINFO@        @ echo ' terminfo directory: '$(ticdir)
        @ echo ''
        @ echo '      man directory: '$(mandir)
 @MAKE_TERMINFO@        @ echo ' terminfo directory: '$(ticdir)
        @ echo ''

-       @ test "$(includedir)" = "$(prefix)/include" || \
+       @ test "$(INCLUDEDIR)" = "$(prefix)/include" || \

                echo '** Include-directory is not in a standard location'
                echo '** Include-directory is not in a standard location'

-       @ test ! -f $(includedir)/termcap.h || \
-               fgrep NCURSES_VERSION $(includedir)/termcap.h >/dev/null || \
+       @ test ! -f $(INCLUDEDIR)/termcap.h || \
+               fgrep NCURSES_VERSION $(INCLUDEDIR)/termcap.h >/dev/null || \

                echo '** Will overwrite non-ncurses termcap.h'
                echo '** Will overwrite non-ncurses termcap.h'

-       @ test ! -f $(includedir)/curses.h || \
-               fgrep NCURSES_VERSION $(includedir)/curses.h >/dev/null || \
+       @ test ! -f $(INCLUDEDIR)/curses.h || \
+               fgrep NCURSES_VERSION $(INCLUDEDIR)/curses.h >/dev/null || \

                echo '** Will overwrite non-ncurses curses.h'
 
 distclean \
                echo '** Will overwrite non-ncurses curses.h'
 
 distclean \