macros: name the file like macros.$(SERVICE_NAME)

praiskup · praiskup · commit 918ee6d539d8 · 2017-11-14T12:46:17.000+01:00
There's no need to convert dashes to underscore in filename.

* lib/rpm/Makefile.inc (rpm_macros): Substitute
s/SERVICE_NAME_VARNAME/SERVICE_NAME/.
diff --git a/lib/rpm/Makefile.inc b/lib/rpm/Makefile.inc
@@ -1,4 +1,4 @@
-rpm_macros	= %D%/macros.d/macros.$(NAME_SERVICE_VARNAME)
+rpm_macros	= %D%/macros.d/macros.$(NAME_SERVICE)
 rpm_macros_in	= %D%/macros.d/macros.in
 
 rpmmacros_DATA	= $(rpm_macros)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-rpm_macros = %D%/macros.d/macros.$(NAME_SERVICE_VARNAME)`
	`1`	`+rpm_macros = %D%/macros.d/macros.$(NAME_SERVICE)`
`2`	`2`	`rpm_macros_in = %D%/macros.d/macros.in`
`3`	`3`
`4`	`4`	`rpmmacros_DATA = $(rpm_macros)`