ncurses 5.8 - patch 20110326

[ncurses.git] / misc / Makefile.in

diff --git a/misc/Makefile.in b/misc/Makefile.in
index 15480ee77b7b9ca22977fe4948a7ee30bee0dea2..93c9b3df30174f4b971836b44f422d53f7c52b97 100644 (file)
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.48 2009/01/03 23:52:41 tom 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@
@@ -76,7 +75,7 @@ all : terminfo.tmp
 
 depend :
 
-sources :
+sources :: terminfo.tmp 
 
 install : install.data install.libs
 
@@ -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,11 +104,12 @@ 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
-@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 :
 @MAKE_PC_FILES@        $(SHELL) ./gen-pkgconfig
 @MAKE_PC_FILES@        touch $@
@@ -127,8 +126,9 @@ run_tic.sed :
 $(DESTDIR)$(bindir) \
 $(DESTDIR)$(libdir) \
 $(DESTDIR)$(datadir) \
-$(DESTDIR)$(tabsetdir) :
-       $(SHELL) $(top_srcdir)/mkdirs.sh $@
+$(DESTDIR)$(tabsetdir) \
+$(DESTDIR)$(PKG_CONFIG_LIBDIR) :
+       mkdir -p $@
 
 uninstall : uninstall.data uninstall.libs
 
@@ -139,7 +139,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 :