X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=free%2Flibs%2FMakefile;h=585445652ec60906c3503fa890da08e26900220a;hb=ff63510605a8dfc41efb908015364152fa676d9b;hp=7f91ca0242b1e06e5286cb457aa4f135cef3eb09;hpb=5fb99145e6565ea2194cb82d38a2c9a1e3fa1da8;p=libucw.git

diff --git a/free/libs/Makefile b/free/libs/Makefile
index 7f91ca02..58544565 100644
--- a/free/libs/Makefile
+++ b/free/libs/Makefile
@@ -13,6 +13,9 @@ obj/config.mk:
 # We will use the libucw build system
 include $(s)/build/Maketop
 
+# Install the build system
+include $(s)/build/Makefile
+
 # The UCW library
 include $(s)/ucw/Makefile
 
@@ -26,7 +29,7 @@ CONFIGS+=$(FREE_CONFIGS)
 INSTALL_TARGETS+=install-configs
 install-configs:
 	install -d -m 755 $(DESTDIR)$(INSTALL_CONFIG_DIR)
-	install -m 644 $(addprefix run/cf/,$(FREE_CONFIGS)) $(DESTDIR)$(INSTALL_CONFIG_DIR)
+	install -m 644 $(addprefix run/$(CONFIG_DIR)/,$(FREE_CONFIGS)) $(DESTDIR)$(INSTALL_CONFIG_DIR)
 
 # Set up names of common libraries (to avoid forward references in rules)
 LIBCHARSET=$(o)/charset/libcharset.pc
@@ -49,13 +52,18 @@ endif
 
 endif
 
+# Build documentation by default?
+ifdef CONFIG_DOC
+all: docs
+endif
+
 libs: $(LIBUCW) $(LIBSH) $(LIBIMAGES) $(LIBCHARSET) $(LIBLANG)
 
 # And finally the default rules of the build system
 include $(s)/build/Makebottom
 
 ifndef CONFIG_LOCAL
-install: $(INSTALL_TARGETS)
+install: all $(INSTALL_TARGETS)
 else
 install:
 	@echo "Nothing to install, this is a local build." && false