X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=build%2FMakebottom;h=585204dcbaf10fcbc54d48f77ba5112bb528f085;hb=5403c0fab834f71416e627dfd7346a577a0ca6f5;hp=36ee4585010aa347183c718e93208540d41457b9;hpb=85ef47bacfcb558a9e3a76ab94342e4bcb932e75;p=libucw.git

diff --git a/build/Makebottom b/build/Makebottom
index 36ee4585..585204dc 100644
--- a/build/Makebottom
+++ b/build/Makebottom
@@ -18,7 +18,7 @@ programs: $(PROGS)
 datafiles: $(DATAFILES)
 tests: $(TESTS)
 configs: $(addprefix run/$(CONFIG_DIR)/,$(CONFIGS))
-docs: runtree $(DOCS) $(DOC_INDICES)
+docs: runtree $(DOCS) $(DOC_INDICES) $(MANPAGES)
 
 tags:
 	etags `find . -name "*.[ch]"`
@@ -42,7 +42,7 @@ force:
 
 # Rules for configuration files
 
-run/$(CONFIG_DIR)/%: $(s)/$(CONFIG_DIR)/% $(o)/config.mk $(BUILDSYS)/genconf
+run/$(CONFIG_DIR)/%: $(s)/$(CONFIG_SRC_DIR)/% $(o)/config.mk $(BUILDSYS)/genconf
 	$(M)CF $<
 	$(Q)$(BUILDSYS)/genconf $< $@ $(o)/config.mk
 
@@ -63,8 +63,10 @@ endif
 
 %.so:
 	$(M)LD $@
-	$(Q)$(CC) $(LSHARED) $(LDFLAGS) -o $@ $(shell PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" $(BUILDSYS)/lib-flags $^) $(LIBS)
+	$(Q)$(CC) $(LSHARED) $(LDFLAGS) -o $@ $(shell PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" PKG_CONFIG_OPTS="$(PKG_CONFIG_OPTS)" $(BUILDSYS)/lib-flags $^) $(LIBS)
 	$(Q)$(call symlink-alias,$@,run/$(SO_RUNDIR),$(*F)$(SONAME_INFIX).so$(SONAME_SUFFIX))
+	$(Q)ln -fs $(*F)$(SONAME_INFIX).so$(SONAME_SUFFIX) run/$(SO_RUNDIR)/$(*F)$(SONAME_INFIX).so
+
 # On Darwin, gcc expects shared libraries in *.dylib instead of *.so.
 # Surprisingly, when a program is run, it suffices to have *.so files.
 # We don't want to mess up the whole build system with configurable
@@ -73,7 +75,7 @@ endif
 %.dylib: %.so
 	cd $(dir $<) && ln -fs $(notdir $<) $(notdir $@)
 
-$(o)/%.pc: $(s)/%.pc $(o)/%.$(LS)
+$(o)/%.pc: $(s)/%.pc $(o)/%$(LV).$(LS)
 	$(M)PC $<
 	$(Q)DEPS="$(shell $(BUILDSYS)/lib-deps $^)" LIBDIR=$(@D) $(BUILDSYS)/genconf $< $@ $(o)/config.mk
 	$(Q)mkdir -p $(o)/pkgconfig
@@ -141,7 +143,7 @@ $(o)/%-tt.o: $(s)/%.c $(o)/autoconf.h
 
 $(o)/%-t: $(o)/%-tt.o $(TESTING_DEPS)
 	$(M)LD-TEST $@
-	$(Q)$(CC) $(LDFLAGS) -o $@ $(shell PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" $(BUILDSYS)/lib-flags $^) $(LIBS)
+	$(Q)$(CC) $(LDFLAGS) -o $@ $(shell PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" PKG_CONFIG_OPTS="$(PKG_CONFIG_OPTS)" $(BUILDSYS)/lib-flags $^) $(LIBS)
 
 $(o)/%.test: $(s)/%.t $(BUILDSYS)/tester
 	$(M)TEST $@
@@ -153,7 +155,7 @@ BINDIR=bin
 
 $(o)/%: $(o)/%.o
 	$(M)LD $@
-	$(Q)$(CC) $(LDFLAGS) -o $@ $(shell PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" $(BUILDSYS)/lib-flags $^) $(LIBS)
+	$(Q)$(CC) $(LDFLAGS) -o $@ $(shell PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" PKG_CONFIG_OPTS="$(PKG_CONFIG_OPTS)" $(BUILDSYS)/lib-flags $^) $(LIBS)
 	$(Q)$(call symlink,$@,run/$(BINDIR))
 
 $(o)/%: $(s)/%.sh $(o)/config.mk $(BUILDSYS)/genconf
@@ -208,6 +210,11 @@ $(o)/%.html: $(o)/%.txt $(BUILDSYS)/asciidoc.conf $(BUILDSYS)/asciidoc-xhtml.con
 	$(Q)asciidoc -e -f $(BUILDSYS)/asciidoc.conf -f $(BUILDSYS)/asciidoc-xhtml.conf -f $(HOST_PREFIX)/etc/asciidoc/asciidoc.conf -f $(HOST_PREFIX)/etc/asciidoc/xhtml11.conf $<
 	$(Q)$(call symlink,$@,run/$(DOCDIR)/$(DOC_MODULE))
 
+$(MANPAGES): $(o)/%.1: $(s)/%.txt
+	$(M)"MANPAGE $<"
+	$(Q)a2x -d manpage -f manpage $<
+	$(Q)mv $(patsubst %.txt, %.1, $<) $(dir $@)
+
 # In reality, we do not depend on the .txt files, but on the corresponding .deflist's.
 # However, the Makefile language cannot express that doc-extract generates both .txt
 # and .deflist, so we always use the .txt's in dependencies.