Skip to content

Commit 41e29e9

Browse files
Use meson string interpolation
1 parent 28ca0d5 commit 41e29e9

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

Makefile.in

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ endif
2929
ULWGL/ULWGL_VERSION.json: ULWGL/ULWGL_VERSION.json.in
3030
$(info :: Updating $(@) )
3131
cp $(<) $(<).tmp
32-
sed 's|##ULWGL_VERSION##|$(shell git describe --always --long --tags)|g' -i $(<).tmp
33-
sed 's|##REAPER_VERSION##|$(shell git -C subprojects/reaper describe --always --long --tags)|g' -i $(<).tmp
32+
sed 's|@ULWGL_VERSION@|$(shell git describe --always --long --tags)|g' -i $(<).tmp
33+
sed 's|@REAPER_VERSION@|$(shell git -C subprojects/reaper describe --always --long --tags)|g' -i $(<).tmp
3434
mv $(<).tmp $(@)
3535

3636
.PHONY: version
@@ -44,7 +44,7 @@ version-install: version
4444

4545
$(OBJDIR)/.build-ulwgl: | $(OBJDIR)
4646
$(info :: Building ulwgl )
47-
sed 's|##INSTALL_PATH##|$(DATADIR)/$(INSTALLDIR)|g' ULWGL/ulwgl-run.in > $(OBJDIR)/ulwgl-run
47+
sed 's|@INSTALL_PATH@|$(DATADIR)/$(INSTALLDIR)|g' ULWGL/ulwgl-run.in > $(OBJDIR)/ulwgl-run
4848
touch $(@)
4949

5050
.PHONY: ulwgl
@@ -88,7 +88,7 @@ ulwgl-install: version-install ulwgl-dist-install ulwgl-docs-install ulwgl-bin-i
8888
# ulwgl-launcher is separate to allow control over installing the bin target
8989
$(OBJDIR)/.build-ulwgl-launcher: | $(OBJDIR)
9090
$(info :: Building ulwgl-launcher )
91-
sed 's|##INSTALL_PATH##|$(DATADIR)/$(INSTALLDIR)|g' ULWGL/ULWGL-Launcher/ulwgl-run.in > $(OBJDIR)/ulwgl-launcher-run
91+
sed 's|@INSTALL_PATH@|$(DATADIR)/$(INSTALLDIR)|g' ULWGL/ULWGL-Launcher/ulwgl-run.in > $(OBJDIR)/ulwgl-launcher-run
9292
touch $(@)
9393

9494
.PHONY: ulwgl-launcher

ULWGL/ULWGL-Launcher/ulwgl-run.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/usr/bin/env sh
2-
##INSTALL_PATH##/ulwgl_run.py "$@"
2+
@INSTALL_PATH@/ulwgl_run.py "$@"
33

ULWGL/ULWGL_VERSION.json.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"ulwgl": {
33
"versions": {
4-
"launcher": "##ULWGL_VERSION##",
5-
"runner": "##ULWGL_VERSION##",
4+
"launcher": "@ULWGL_VERSION@",
5+
"runner": "@ULWGL_VERSION@",
66
"runtime_platform": "sniper_platform_0.20240125.75305",
7-
"reaper": "##REAPER_VERSION##",
7+
"reaper": "@REAPER_VERSION@",
88
"pressure_vessel": "v0.20240212.0"
99
}
1010
}

ULWGL/ulwgl-run.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/usr/bin/env sh
2-
##INSTALL_PATH##/ulwgl_run.py "$@"
2+
@INSTALL_PATH@/ulwgl_run.py "$@"
33

0 commit comments

Comments
 (0)