X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=build%2FMakebottom;h=e2c840270933077bbf012b1a6ac67a5a99c64755;hb=39b28bffc195348b93294b5fa0a8b9e87ea7317a;hp=8565d02c50eae1d8002761c00d2e64b337029b1e;hpb=e0e954f2989ce2e93fa6f591ef1ec195ce2d8289;p=libucw.git

diff --git a/build/Makebottom b/build/Makebottom
index 8565d02c..e2c84027 100644
--- a/build/Makebottom
+++ b/build/Makebottom
@@ -42,7 +42,7 @@ force:
 
 # Rules for configuration files
 
-run/$(CONFIG_DIR)/%: $(s)/cf/% $(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,16 @@ endif
 
 %.so:
 	$(M)LD $@
-	$(Q)$(CC) $(LSHARED) $(LDFLAGS) -o $@ $^
-	$(Q)$(call symlink-alias,$@,run/lib,$(*F)$(SONAME_INFIX).so$(SONAME_SUFFIX))
+	$(Q)$(CC) $(LSHARED) $(LDFLAGS) -o $@ $(shell PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" $(BUILDSYS)/lib-flags $^) $(LIBS)
+	$(Q)$(call symlink-alias,$@,run/$(SO_RUNDIR),$(*F)$(SONAME_INFIX).so$(SONAME_SUFFIX))
+
+# 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
+# suffices and we also don't want to incur an overhead on Linux, so we
+# just create symbolic links on Darwin, if requested.
+%.dylib: %.so
+	cd $(dir $<) && ln -fs $(notdir $<) $(notdir $@)
 
 $(o)/%.pc: $(s)/%.pc $(o)/%.$(LS)
 	$(M)PC $<
@@ -198,7 +206,7 @@ $(DATAFILES): $(o)/%: $(s)/%
 
 $(o)/%.html: $(o)/%.txt $(BUILDSYS)/asciidoc.conf $(BUILDSYS)/asciidoc-xhtml.conf run/$(DOCDIR)/$(DOC_MODULE)/.dir-stamp
 	$(M)"DOC-HTML $<"
-	$(Q)asciidoc -e -f $(BUILDSYS)/asciidoc.conf -f $(BUILDSYS)/asciidoc-xhtml.conf -f /etc/asciidoc/asciidoc.conf -f /etc/asciidoc/xhtml11.conf $<
+	$(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))
 
 # In reality, we do not depend on the .txt files, but on the corresponding .deflist's.