X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=misc%2FMakefile.in;h=15de656f7d43d516e5a8720b4a441744c463e933;hp=15480ee77b7b9ca22977fe4948a7ee30bee0dea2;hb=0141530788318928d6e4da45eb1ec88c86940645;hpb=96097feb6ca4e2c4c944f3ed789c89d964611655 diff --git a/misc/Makefile.in b/misc/Makefile.in index 15480ee7..15de656f 100644 --- 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.53 2010/05/15 20:25:20 tom Exp $ ############################################################################## -# Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. # +# Copyright (c) 1998-2009,2010 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"), # @@ -57,9 +57,6 @@ bindir = @bindir@ libdir = @libdir@ datadir = @datadir@ -CC = @CC@ -HOSTCC = @BUILD_CC@ - tabsetdir = $(datadir)/tabset ticdir = @TERMINFO@ ticfile = $(ticdir).db @@ -76,7 +73,7 @@ all : terminfo.tmp depend : -sources : +sources :: terminfo.tmp install : install.data install.libs @@ -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,9 +104,10 @@ 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 : @MAKE_PC_FILES@ $(SHELL) ./gen-pkgconfig @MAKE_PC_FILES@ touch $@ @@ -127,8 +124,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 +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 :