From 5331789603d50304330656024538d6ec36b4fb49 Mon Sep 17 00:00:00 2001 From: Kalle Olavi Niemitalo Date: Sun, 17 Dec 2006 16:25:12 +0200 Subject: [PATCH] Remove cmd_installsrcdata. cmd_installdata with $(srcdir) now does the same thing. --- Makefile.lib | 4 ---- doc/Makefile | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Makefile.lib b/Makefile.lib index cbf6d2f3..77089c01 100644 --- a/Makefile.lib +++ b/Makefile.lib @@ -63,10 +63,6 @@ quiet_cmd_recmake = "[$(INFO_COLOR)MAKE $(3)$(END_COLOR)] $(RELPATH)$(2)" quiet_cmd_installdata = " [$(INSTALL_COLOR)INSTALL$(END_COLOR)] $(RELPATH)$(patsubst $(srcdir)%,%,$(2)) -> $(3)" cmd_installdata = $(INSTALL_DATA) $(2) $(3) -# Install a data file from the source (not build) directory -quiet_cmd_installsrcdata = " [$(INSTALL_COLOR)INSTALL$(END_COLOR)] $(RELPATH)$(2) -> $(3)" - cmd_installsrcdata = $(INSTALL_DATA) $(srcdir)$(2) $(3) - quiet_cmd_installprog = " [$(INSTALL_COLOR)INSTALL$(END_COLOR)] $(RELPATH)$(2) -> $(3)" cmd_installprog = $(INSTALL_PROGRAM) $(2) $(3) diff --git a/doc/Makefile b/doc/Makefile index ea42b7f9..2053e9a4 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -88,7 +88,7 @@ install-doc: all-docs update-man install $(call ncmd,installdata,$(doc),$(PDF_DIR));) @$(foreach doc,$(TXT_DOCS_ASIS), \ $(MKINSTALLDIRS) $(DESTDIR)$(docdir)/$(PACKAGE)/txt; \ - $(call ncmd,installsrcdata,$(doc),$(TXT_DIR));) + $(call ncmd,installdata,$(srcdir)$(doc),$(TXT_DIR));) update-man: man @$(if $(MAN_DOCS), \