X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=misc%2FMakefile.in;h=ff1c527d07ffd3a355fb4e995a9316fce46a066d;hp=bfd83a993fb18f188a28d413d5ede6e0194b67c5;hb=c8e187fc9682a3c5cfaebc480fc98d8585f6caf6;hpb=95a30fbbfc81d5eb0a76e139c86e0a6505cad871 diff --git a/misc/Makefile.in b/misc/Makefile.in index bfd83a99..ff1c527d 100644 --- a/misc/Makefile.in +++ b/misc/Makefile.in @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 1.50 2009/01/24 21:42:15 tom Exp $ +# $Id: Makefile.in,v 1.52 2009/08/15 17:13:49 tom Exp $ ############################################################################## # Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. # # # @@ -57,9 +57,6 @@ bindir = @bindir@ libdir = @libdir@ datadir = @datadir@ -CC = @CC@ -HOSTCC = @BUILD_CC@ - tabsetdir = $(datadir)/tabset ticdir = @TERMINFO@ ticfile = $(ticdir).db @@ -93,8 +90,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 \ @@ -108,8 +104,8 @@ 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) -@MAKE_PC_FILES@install.libs :: pc-files -@MAKE_PC_FILES@ $(SHELL) -c 'for name in *.pc; do $(INSTALL_DATA) $$name $(PKG_CONFIG_LIBDIR)/$$name; done' +@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' @MAKE_PC_FILES@sources :: pc-files @MAKE_PC_FILES@pc-files : @@ -128,7 +124,8 @@ run_tic.sed : $(DESTDIR)$(bindir) \ $(DESTDIR)$(libdir) \ $(DESTDIR)$(datadir) \ -$(DESTDIR)$(tabsetdir) : +$(DESTDIR)$(tabsetdir) \ +$(DESTDIR)$(PKG_CONFIG_LIBDIR) : $(SHELL) $(top_srcdir)/mkdirs.sh $@ uninstall : uninstall.data uninstall.libs @@ -140,7 +137,7 @@ uninstall.data : uninstall.libs : -rm -f $(DESTDIR)$(bindir)/$(NCURSES_CONFIG) -@MAKE_PC_FILES@ $(SHELL) 'for name in *.pc; do rm -f $(PKG_CONFIG_LIBDIR)/$$name; done' +@MAKE_PC_FILES@ $(SHELL) 'for name in *.pc; do rm -f $(DESTDIR)$(PKG_CONFIG_LIBDIR)/$$name; done' tags :