X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=Makefile.in;h=803746c2b6a7d6255e7a275b428b50717bbad797;hp=6c5b6f96b8377b70077acffed9563aa56dd49c2d;hb=50acaeeb9b282767ffe9c6a80f120b32ce3bd966;hpb=a0bb9c404174926bf131a5989a0524a6eecd09eb;ds=sidebyside diff --git a/Makefile.in b/Makefile.in index 6c5b6f96..803746c2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,6 @@ -# $Id: Makefile.in,v 1.37 2013/08/03 22:58:52 tom Exp $ +# $Id: Makefile.in,v 1.38 2014/01/18 20:19:45 tom Exp $ ############################################################################## -# Copyright (c) 1998-2012,2013 Free Software Foundation, Inc. # +# Copyright (c) 1998-2013,2014 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"), # @@ -27,7 +27,7 @@ # authorization. # ############################################################################## # -# Author: Thomas E. Dickey 1996,1997 +# Author: Thomas E. Dickey 1996-on # # Master Makefile for ncurses library. @@ -58,7 +58,7 @@ includesubdir = @includesubdir@ libdir = @libdir@ mandir = @mandir@ -INCLUDEDIR = ${DESTDIR}${includedir}${includesubdir} +include_dir = ${includedir}${includesubdir} INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -79,17 +79,17 @@ preinstall : @ echo '' @ echo ' bin directory: '$(bindir) @ echo ' lib directory: '$(libdir) - @ echo ' include directory: '$(INCLUDEDIR) + @ echo ' include directory: '$(include_dir) @ echo ' man directory: '$(mandir) @MAKE_TERMINFO@ @ echo ' terminfo directory: '$(ticdir) @ echo '' - @ test "$(INCLUDEDIR)" = "$(prefix)/include" || \ + @ test "$(include_dir)" = "$(prefix)/include" || \ echo '** Include-directory is not in a standard location' - @ test ! -f $(INCLUDEDIR)/termcap.h || \ - fgrep NCURSES_VERSION $(INCLUDEDIR)/termcap.h >/dev/null || \ + @ test ! -f $(include_dir)/termcap.h || \ + fgrep NCURSES_VERSION $(include_dir)/termcap.h >/dev/null || \ echo '** Will overwrite non-ncurses termcap.h' - @ test ! -f $(INCLUDEDIR)/curses.h || \ - fgrep NCURSES_VERSION $(INCLUDEDIR)/curses.h >/dev/null || \ + @ test ! -f $(include_dir)/curses.h || \ + fgrep NCURSES_VERSION $(include_dir)/curses.h >/dev/null || \ echo '** Will overwrite non-ncurses curses.h' distclean \