Adapt template to changes in opengeode

templates/skeletons/opengeode-structure/makefile.tmplt

@@ -15,13 +15,12 @@ compile-linux:
 	mkdir -p obj && cd obj && \
 	@@IF@@ @_EXIST:Instance_Of_@
 	   opengeode --toAda  ../src/system_structure.pr ../../../@_LOWER:Instance_Of_@/SDL/src/@_LOWER:Instance_Of_@.pr && \
-	       rm ../src/@_LOWER:Instance_Of_@.ad? && \
-	       ADA_INCLUDE_PATH=../../../@_LOWER:Instance_Of_@/SDL/src/:../../../dataview/Ada gnat make ../src/@_LOWER:Name_@
+	       ADA_INCLUDE_PATH=../../../@_LOWER:Instance_Of_@/SDL/obj/:../../../dataview/Ada gnat make @_LOWER:Name_@
  	@@ELSE@@
 	   opengeode --toAda ../src/@_LOWER:Name_@.pr ../src/system_structure.pr && \
 	@@END_IF@@
 	   @@IF@@ not @_Is_Type_@ and not @_EXIST:Instance_Of_@
-	ADA_INCLUDE_PATH=../../../dataview/Ada gnat make ../src/@_LOWER:Name_@
+	ADA_INCLUDE_PATH=../../../dataview/Ada gnat make @_LOWER:Name_@
 	@@ELSE@@
 	:
 	@@END_IF@@

test/test21/ccsds_packet.asn

@@ -44,7 +44,7 @@ BEGIN
         pusVersion      PusVersionNumber,
         timeRefStatus   PusTimeReferenceStatus,
         serviceId       PusServiceType,
-        subtype         PusSubserviceType,
+        service-subtype         PusSubserviceType,
         msgTypeCount    PusMessageTypeCounter,
         destination     PusApid,
         time            PusTime
@@ -68,7 +68,7 @@ BEGIN
         pusVersion      PusVersionNumber,
         ackFlags        PusAcknowledgementFlags,
         serviceId       PusServiceType,
-        subtype         PusSubserviceType,
+        service-subtype         PusSubserviceType,
         source          PusApid
         -- no spare bits
     }