Fix installation of config files

[libucw.git] / free / libs / Makefile

diff --git a/free/libs/Makefile b/free/libs/Makefile
index 12163bd5e707a91d033cfe853d80293d18225367..8c5494b3c7f53c9e376eb48158b4354b3a063efb 100644 (file)
--- a/free/libs/Makefile
+++ b/free/libs/Makefile
@@ -26,7 +26,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,16 +49,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 -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