X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=misc%2FMakefile.in;h=93c9b3df30174f4b971836b44f422d53f7c52b97;hp=6b71b6265bebe3e4cd26187fe69791af7ffdf9b3;hb=d4d1d81ab6fc1ad681ff120d925099f947fefcf3;hpb=eae581c0044c1c0ef9caa17fc9b9ae6ef4c93cca;ds=inline diff --git a/misc/Makefile.in b/misc/Makefile.in index 6b71b626..93c9b3df 100644 --- a/misc/Makefile.in +++ b/misc/Makefile.in @@ -1,6 +1,6 @@ -# $Id: Makefile.in,v 1.51 2009/02/07 18:17:17 Miroslav.Lichvar Exp $ +# $Id: Makefile.in,v 1.56 2011/02/21 01:09:31 tom Exp $ ############################################################################## -# Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. # +# Copyright (c) 1998-2010,2011 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"), # @@ -43,6 +43,7 @@ .SUFFIXES : SHELL = /bin/sh +VPATH = @srcdir@ THIS = Makefile CF_MFLAGS = @cf_cv_makeflags@ @@ -57,16 +58,14 @@ bindir = @bindir@ libdir = @libdir@ datadir = @datadir@ -CC = @CC@ -HOSTCC = @BUILD_CC@ - tabsetdir = $(datadir)/tabset ticdir = @TERMINFO@ ticfile = $(ticdir).db source = @TERMINFO_SRC@ INSTALL = @INSTALL@ -INSTALL_PROG = @INSTALL_SCRIPT@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_DATA = @INSTALL_DATA@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ @@ -93,8 +92,7 @@ install.data : terminfo.tmp \ datadir=${datadir} \ ticdir=${ticdir} \ source=terminfo.tmp \ - THIS_CC="$(CC)" \ - THAT_CC="$(HOSTCC)" \ + cross_compiling=@cross_compiling@ \ $(SHELL) ./run_tic.sh @cd $(srcdir)/tabset && \ $(SHELL) -c 'for i in * ; do \ @@ -106,7 +104,7 @@ install.data : terminfo.tmp \ NCURSES_CONFIG = ncurses@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config install.libs :: $(DESTDIR)$(bindir) ncurses-config - $(INSTALL_PROG) ncurses-config $(DESTDIR)$(bindir)/$(NCURSES_CONFIG) + $(INSTALL_SCRIPT) ncurses-config $(DESTDIR)$(bindir)/$(NCURSES_CONFIG) @MAKE_PC_FILES@install.libs :: pc-files $(DESTDIR)$(PKG_CONFIG_LIBDIR) @MAKE_PC_FILES@ $(SHELL) -c 'for name in *.pc; do $(INSTALL_DATA) $$name $(DESTDIR)$(PKG_CONFIG_LIBDIR)/$$name; done' @@ -130,7 +128,7 @@ $(DESTDIR)$(libdir) \ $(DESTDIR)$(datadir) \ $(DESTDIR)$(tabsetdir) \ $(DESTDIR)$(PKG_CONFIG_LIBDIR) : - $(SHELL) $(top_srcdir)/mkdirs.sh $@ + mkdir -p $@ uninstall : uninstall.data uninstall.libs