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.

diff --git a/free/libs/Makefile b/free/libs/Makefile
index 12163bd5e707a91d033cfe853d80293d18225367..afd3d6f09391f297d65f1af73c56a4a424caa344 100644 (file)
--- 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 19bb3cdb78753036ae21038dbdd5cb8a8fed785d..476950278ab402452d31532e8b3fe097e171e087 100644 (file)
--- 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 <ucw\/autoconf.h>/' <run/include/ucw/config.h >$(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)