Example: Fix the previous commit.

[libucw.git] / free / libs / Makefile

diff --git a/free/libs/Makefile b/free/libs/Makefile
index 12163bd5e707a91d033cfe853d80293d18225367..c08913f8a3f22f12e98a39f925d17ba67fff5094 100644 (file)
--- a/free/libs/Makefile
+++ b/free/libs/Makefile
@@ -10,8 +10,13 @@ s=.
 obj/config.mk:
        @echo "You need to run configure first." && false
 
+BUILDSYS=$(s)/build
+
 # We will use the libucw build system
-include $(s)/build/Maketop
+include $(BUILDSYS)/Maketop
+
+# Install the build system
+include $(BUILDSYS)/Makefile
 
 # The UCW library
 include $(s)/ucw/Makefile
@@ -26,7 +31,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 +54,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
+include $(BUILDSYS)/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