From 3f382631d608544d29b1701d80a3d5e1569efa6d Mon Sep 17 00:00:00 2001
From: Pavel Charvat <pchar@ucw.cz>
Date: Sat, 7 Dec 2013 12:22:14 +0100
Subject: [PATCH] Packages: Improved installation of example configs.

---
 debian/mk       |  6 +++++-
 debian/rules    |  2 +-
 images/Makefile | 10 ++++++----
 ucw/Makefile    | 10 ++++++----
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/debian/mk b/debian/mk
index 7a9db593..86bbc9ba 100755
--- a/debian/mk
+++ b/debian/mk
@@ -19,7 +19,11 @@ EOF
 function pkg-gen-debian {(
 	cd $BUILDDIR
 	echo "Configuring"
-	./configure debian/config VER="$VER" TREEHASH="$TREEHASH" $CONF PREFIX=/ INSTALL_INCLUDE_DIR=/usr/include/libucw INSTALL_DOC_DIR=/usr/share/doc/libucw/html
+	./configure debian/config VER="$VER" TREEHASH="$TREEHASH" $CONF \
+		PREFIX=/ \
+		INSTALL_INCLUDE_DIR=/usr/include/libucw \
+		INSTALL_DOC_DIR=/usr/share/doc/libucw/html \
+		INSTALL_CONFIG_DIR=/usr/share/doc/libucw/examples/etc
 
 	echo "Creating debian/control"
 	build/genconf debian/control.in debian/control obj/config.mk
diff --git a/debian/rules b/debian/rules
index 29d800f2..b0251004 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,9 +31,9 @@ install: build
 	$(MAKE) DESTDIR=$(CURDIR)/debian/libucw-dev $(addprefix install-,$(addsuffix -api,libucw libucw-charset libucw-xml libucw-images))
 	$(MAKE) DESTDIR=$(CURDIR)/debian/libucw-utils install-ucw-utils install-ucw-shell install-libucw-charset-utils install-libucw-images-utils
 	$(MAKE) DESTDIR=$(CURDIR)/debian/libucw-doc install-libucw-docs
+	$(MAKE) DESTDIR=$(CURDIR)/debian/libucw-doc install-libucw-config install-libucw-images-config
 	install -d -m 755 $(CURDIR)/debian/libucw-doc/usr/share/doc/libucw/examples
 	cp -r examples/external $(CURDIR)/debian/libucw-doc/usr/share/doc/libucw/examples/program
-	cp -r etc $(CURDIR)/debian/libucw-doc/usr/share/doc/libucw/examples/
 
 binary-indep: build install
 
diff --git a/images/Makefile b/images/Makefile
index 2a43373e..96fb1ece 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -92,7 +92,7 @@ $(o)/images/.include-stamp: $(addprefix $(s)/images/,$(LIBIMAGES_INCLUDES))
 $(o)/images/.include-stamp: IDST=images
 run/lib/pkgconfig/libucw-images.pc: $(o)/images/libucw-images.pc
 
-INSTALL_TARGETS+=install-libucw-images install-libucw-images-api install-libucw-images-utils
+INSTALL_TARGETS+=install-libucw-images install-libucw-images-api install-libucw-images-utils install-libucw-images-config
 
 install-libucw-images:
 	install -d -m 755 $(DESTDIR)$(INSTALL_LIB_DIR)
@@ -105,11 +105,13 @@ install-libucw-images-api:
 	ln -sf libucw-images.so.$(UCW_ABI_VERSION) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-images.so
 	install -m 644 run/lib/libucw-images.a $(DESTDIR)$(INSTALL_LIB_DIR)
 	install -m 644 run/lib/libucw-images-pic.a $(DESTDIR)$(INSTALL_LIB_DIR)
-	#install -d -m 755 $(DESTDIR)$(INSTALL_CONFIG_DIR)
-	#install -m 644 $(addprefix run/$(CONFIG_DIR)/,$(LIBIMAGES_CONFIGS)) $(DESTDIR)$(INSTALL_CONFIG_DIR)
 
 install-libucw-images-utils:
 	install -d -m 755 $(DESTDIR)$(INSTALL_BIN_DIR)
 	install -m 755 $(LIBIMAGES_PROGS) $(DESTDIR)$(INSTALL_BIN_DIR)
 
-.PHONY: install-libucw-images install-libucw-images-api install-libucw-images-utils
+install-libucw-images-config:
+	install -d -m 755 $(DESTDIR)$(INSTALL_CONFIG_DIR)
+	install -m 644 $(addprefix run/$(CONFIG_DIR)/,$(LIBIMAGES_CONFIGS)) $(DESTDIR)$(INSTALL_CONFIG_DIR)
+
+.PHONY: install-libucw-images install-libucw-images-api install-libucw-images-utils install-libucw-images-config
diff --git a/ucw/Makefile b/ucw/Makefile
index 873f06e1..557d3ea1 100644
--- a/ucw/Makefile
+++ b/ucw/Makefile
@@ -184,7 +184,7 @@ endif
 
 CONFIGS+=libucw
 
-INSTALL_TARGETS+=install-libucw install-libucw-api
+INSTALL_TARGETS+=install-libucw install-libucw-api install-libucw-config
 
 install-libucw:
 	install -d -m 755 $(DESTDIR)$(INSTALL_LIB_DIR)
@@ -197,7 +197,9 @@ install-libucw-api:
 	ln -sf libucw.so.$(UCW_ABI_VERSION) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw.so
 	install -m 644 run/lib/libucw.a $(DESTDIR)$(INSTALL_LIB_DIR)
 	install -m 644 run/lib/libucw-pic.a $(DESTDIR)$(INSTALL_LIB_DIR)
-	#install -d -m 755 $(DESTDIR)$(INSTALL_CONFIG_DIR)
-	#install -m 644 run/$(CONFIG_DIR)/libucw $(DESTDIR)$(INSTALL_CONFIG_DIR)
 
-.PHONY: install-libucw install-libucw-api
+install-libucw-config:
+	install -d -m 755 $(DESTDIR)$(INSTALL_CONFIG_DIR)
+	install -m 644 run/$(CONFIG_DIR)/libucw $(DESTDIR)$(INSTALL_CONFIG_DIR)
+
+.PHONY: install-libucw install-libucw-api install-libucw-config
-- 
2.39.2