Change from SOFTWARE_NAME macro to SOFTWARE_AND_VERSION in dirs.in. Add...

Change from SOFTWARE_NAME macro to SOFTWARE_AND_VERSION in dirs.in. Add SOFTWARE_AND_VERSION to NAME_REFEX in build-scripts/configuration-information.sh.

obs/generic/build-scripts/configuration_information.sh

@@ -56,7 +56,7 @@ DISTRIB_TEMPLATES_DIR=`realpath -m $DISTRIB_TEMPLATES_DIR`
 DISTRIB_FILES_DIR=`realpath -m $DISTRIB_FILES_DIR`
 
 ## Regular expressions for templates
-NAME_REGEX="s|%SOFTWARE_NAME%|$SOFTWARE_NAME|g"
+NAME_REGEX="s|%SOFTWARE_NAME%|$SOFTWARE_NAME|g;s|%SOFTWARE_AND_VERSION%|$SOFTWARE_AND_VERSION|g"
 # versions (not used at the moment)
 # versions (supporting legact macros)
 #OLD_VERSION_REGEX="s|\%RECIPE_VERSION\%|$RECIPE_VERSION|g;s|\%VERSION\%|$SOFTWARE_VERSION|g;s|\%DEBIAN_REVISION\%|$DEBIAN_REVISION|g;s|\%COMPOUND_VERSION\%|$COMPOUND_VERSION|g"

obs/generic/templates/distribution-templates/debian_default/dirs.in

-/opt/%SOFTWARE_NAME%/bin/
-/opt/%SOFTWARE_NAME%/lib/
-/opt/%SOFTWARE_NAME%/etc/
+/opt/%SOFTWARE_AND_VERSION%/bin/
+/opt/%SOFTWARE_AND_VERSION%/lib/
+/opt/%SOFTWARE_AND_VERSION%/etc/