From: Martin Mares <mj@ucw.cz>
Date: Thu, 30 Oct 2008 18:48:36 +0000 (+0100)
Subject: Better installation of ucw/autoconf.h.
X-Git-Tag: holmes-import~227^2~5^2~14
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=ef73af52664b2b0db6922d3258c7a515a26a600c;p=libucw.git

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 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 <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)