Merge branch 'feature/fix_rc1_issues' into develop

Author: fsundermeyer

bash_completion/daps

@@ -86,7 +86,7 @@ _daps() {
         *)
             # the global options go here
             case "$prev" in
-                --builddir|--fb_styleroot|--styleroot)
+                --builddir|--fb_styleroot|--styleroot|--adocimgdir)
                     _filedir -d
                     return 0
                     ;;

bin/daps.in

@@ -1582,7 +1582,11 @@ recover_cmdl_values
 # run help if requested
 #
 if [[ "${SCMD_ARGS[@]}" = "-h" ]]; then
+    # source additional functions
+    #
+    [[ -f $LIB_DIR/$SUBCMD ]] && source "$LIB_DIR/$SUBCMD"
     ${SUBCOMMANDS[$SUBCMD]} "$SUBCMD" "${SCMD_ARGS[@]}"
+    exit 0
 fi
 
 # Sample call for early commands

make/adoc2xml.mk

@@ -56,7 +56,7 @@ ifneq "$(strip $(ADOC_IMG_DIR))" ""
   FIG     := $(subst $(ADOC_IMG_DIR)/,$(FIG_DIR)/,$(wildcard $(ADOC_IMG_DIR)/*.fig))
   JPG_DIR := $(IDIR)/jpg
   JPG     := $(subst $(ADOC_IMG_DIR)/,$(JPG_DIR)/,$(wildcard $(ADOC_IMG_DIR)/*.jpg))
-  ODG_DIR := $(IDIR)/pdf
+  ODG_DIR := $(IDIR)/odg
   ODG     := $(subst $(ADOC_IMG_DIR)/,$(ODG_DIR)/,$(wildcard $(ADOC_IMG_DIR)/*.odg))
   PDF_DIR := $(IDIR)/pdf
   PDF     := $(subst $(ADOC_IMG_DIR)/,$(PDF_DIR)/,$(wildcard $(ADOC_IMG_DIR)/*.pdf))
@@ -101,7 +101,7 @@ $(FIG_DIR)/%.fig: $(ADOC_IMG_DIR)/%.fig | $(FIG_DIR)
 $(JPG_DIR)/%.jpg: $(ADOC_IMG_DIR)/%.jpg | $(JPG_DIR)
 	(cd $(@D); ln -sf $<)
 
-$(ODG_DIR)/%.pdf: $(ADOC_IMG_DIR)/%.odg | $(ODG_DIR)
+$(ODG_DIR)/%.odg: $(ADOC_IMG_DIR)/%.odg | $(ODG_DIR)
 	(cd $(@D); ln -sf $<)
 
 $(PDF_DIR)/%.pdf: $(ADOC_IMG_DIR)/%.pdf | $(PDF_DIR)

make/images.mk

@@ -216,7 +216,12 @@ GEN_IMAGES       := $(addprefix $(IMG_GENDIR)/gen/pdf/,$(GEN_PDF)) $(addprefix $
 # creation via pattern targets is not possible. We use an empty target instead
 # and make it a dependenc of $(GEN_IMAGES) (ONLINE_IMAGES) (COLOR_IMAGES)
 #
-$(GEN_IMAGES) (ONLINE_IMAGES) (COLOR_IMAGES): $(IMG_GENDIR)/gen/.odg_gen
+
+# Only run the .odg_gen target if there are ODG files!!
+#
+ifneq "$(strip $(USED_ODG))" ""
+  $(GEN_IMAGES) (ONLINE_IMAGES) (COLOR_IMAGES): $(IMG_GENDIR)/gen/.odg_gen
+endif
 
 $(IMG_GENDIR)/gen/.odg_gen: $(USED_ODG)
 ifeq "$(VERBOSITY)" "2"