From ef73af52664b2b0db6922d3258c7a515a26a600c Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Thu, 30 Oct 2008 19:48:36 +0100 Subject: [PATCH] Better installation of ucw/autoconf.h. The autoconf header should be installed in the install-libucw target, I do not see any need for handling it separately. --- free/libs/Makefile | 5 +---- ucw/Makefile | 1 + 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/free/libs/Makefile b/free/libs/Makefile index 12163bd5..afd3d6f0 100644 --- a/free/libs/Makefile +++ b/free/libs/Makefile @@ -55,10 +55,7 @@ libs: $(LIBUCW) $(LIBSH) $(LIBIMAGES) $(LIBCHARSET) $(LIBLANG) include $(s)/build/Makebottom ifndef CONFIG_LOCAL -install: $(INSTALL_TARGETS) - install -d -m 755 $(DESTDIR)$(INSTALL_INCLUDE_DIR)/ucw - install -m 644 obj/autoconf.h $(DESTDIR)$(INSTALL_INCLUDE_DIR)/ucw - +install: all $(INSTALL_TARGETS) else install: @echo "Nothing to install, this is a local build." && false diff --git a/ucw/Makefile b/ucw/Makefile index 19bb3cdb..47695027 100644 --- a/ucw/Makefile +++ b/ucw/Makefile @@ -148,6 +148,7 @@ INSTALL_TARGETS+=install-libucw install-libucw: install -d -m 755 $(DESTDIR)$(INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/ucw/ $(DESTDIR)$(INSTALL_PKGCONFIG_DIR) install -m 644 $(addprefix run/include/ucw/,$(LIBUCW_MAIN_INCLUDES)) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/ucw/ + install -m 644 obj/autoconf.h $(DESTDIR)$(INSTALL_INCLUDE_DIR)/ucw/ sed -e 's/^#include .autoconf\.h./#include /' $(DESTDIR)$(INSTALL_INCLUDE_DIR)/ucw/config.h install -m 644 run/lib/pkgconfig/libucw.pc $(DESTDIR)$(INSTALL_PKGCONFIG_DIR) install -m 644 run/lib/libucw.$(LS) $(DESTDIR)$(INSTALL_LIB_DIR) -- 2.39.5