Merge branch 'releasebranch_8_3' into patch-2

OSGeo · Mar 9, 2024 · ac2226c · ac2226c
2 parents 69250e7 + d3b958a
commit ac2226c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/include/Make/Compile.make b/include/Make/Compile.make
@@ -47,14 +47,14 @@ depend: $(C_SOURCES) $(CC_SOURCES) $(CPP_SOURCES)
 %.manifest.res: %.manifest.rc %.exe.manifest
 	$(WINDRES) --input=$< --input-format=rc --output=$@ --output-format=coff -I$(MODULE_TOPDIR)/mswindows
 
-%.manifest.rc: $(MODULE_TOPDIR)/mswindows/generic.manifest.rc
+%.manifest.rc: $(MODULE_TOPDIR)/mswindows/generic.manifest.rc.in
 	sed	-e 's/@CMD@/$(notdir $*)/' \
 		-e 's/@VER_MAJOR@/$(GRASS_VERSION_MAJOR)/' \
 		-e 's/@VER_MINOR@/$(GRASS_VERSION_MINOR)/' \
 		-e 's/@VER_RELEASE@/$(GRASS_VERSION_RELEASE)/' \
-		$(MODULE_TOPDIR)/mswindows/generic.manifest.rc > $@
+		$^ > $@
 
 %.exe.manifest: $(MODULE_TOPDIR)/mswindows/generic.manifest
-	sed 's/@CMD@/$(notdir $*)/' $(MODULE_TOPDIR)/mswindows/generic.manifest > $@
+	sed 's/@CMD@/$(notdir $*)/' $^ > $@
 
 -include $(DEPFILE)
diff --git a/mswindows/generic.manifest.rc → mswindows/generic.manifest.rc.in b/mswindows/generic.manifest.rc → mswindows/generic.manifest.rc.in