Packages: Improved installation of example configs.

diff --git a/debian/mk b/debian/mk
index 7a9db593dbf4e9ab878ef43da8d4e26a8238a85a..86bbc9ba5e5b42389d84c82e5b3c8536b17ada50 100755 (executable)
--- 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 29d800f231b89384d563baec32d7e423e1191f2c..b025100410684e3ca5daed4a768593ccaa56a67c 100755 (executable)
--- 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 2a43373e99bc0accdeb4767091044391e45aed9d..96fb1ecee39ec990548da05e2fa1bb01c1399ede 100644 (file)
--- 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 873f06e189b9914fc87457728687ffbf476a554a..557d3ea1aef078185ab763b4bf2498e4189b7861 100644 (file)
--- 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