Merge branch 'dotcdistapproach' into allowredefobject

bin/cdist-config

@@ -44,6 +44,7 @@ __cdist_abs_myname="$__cdist_abs_mydir/$__cdist_myname"
 : ${__cdist_name_code:=code}
 : ${__cdist_name_code_finished:=.codedone}
 : ${__cdist_name_conf_dir:=conf}
+: ${__cdist_name_dot_cdist:=.cdist}
 : ${__cdist_name_explorer:=explorer}
 : ${__cdist_name_gencode:=gencode}
 : ${__cdist_name_gencode_local:=local}
@@ -231,7 +232,7 @@ __cdist_object_id_from_object()
 
 __cdist_object_dir()
 {
-   __cdist_object_dir="${__cdist_out_object_dir}/$1"
+   __cdist_object_dir="${__cdist_out_object_dir}/$1/${__cdist_name_dot_cdist}"
    echo "$__cdist_object_dir"
 }